Re: [PATCH (resend)] Pass -C1 to git-apply in StGIT's apply_diff() and apply_patch().

On Tue, Apr 10, 2007 at 23:38:55 +0100, Catalin Marinas wrote:

When something has changed in the surrounding code (not touched by
your patch), the automatic three-way merge should, in general, be able
to solve the issue as it uses the ancestor information. Is the
automatic three-way merge failing as well in your case?

OK, maybe I was pushing too much.  Indeed, three-way merge will solve
it, I just don't have a setup where it runs automatically, and I
thought the mege could be avoided alltogether.  But I agree the
problem is easily managable.

And as you agree that the option would be nice we are on the same
page.  Thanks you!


-- 
   Tomash Brechko