Re: Can git be stopped from inserting conflict markers during a merge?

["Martin Langhoff" <martin.langhoff@gmail.com>]

On Sun, Mar 9, 2008 at 9:51 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>  Do you want to just have both (with the base version, all three?) versions
>  of the file in your directory?

If that's what he is after, git-mergetool will do it - normally as a
preparation to call xxdiff or something similar. William, perhaps
git-mergetool is what you are after? You can look at the source --
it's shell -- if you want to tweak it.

But I think that what mercurial does is similar to Arch and Bazaar
behaviour: it will update the file following "one side" of the merge,
and then generate a .rej file with the unapplied hunks coming from the
'other side'.  This selection is arbitrary, and doesn't work on
octopus merges, so I end up not quite liking it. OTOH, if you open the
.rej file with emacs in diff mode, it's bloody useful for fixing up
patches so that they apply.

cheers,




m