Re: Merge conflicts as .rej .orig files

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Aug 19, 2005, 15:30 UTC
Message-ID: <Pine.LNX.4.63.0508191115200.23242@iabervon.org>
In-Reply-To: <46a038f9050818200625d64a12@mail.gmail.com>

On Fri, 19 Aug 2005, Martin Langhoff wrote:

Show 8 quoted lines

> After using arch for a while, I've gotten used to getting .rej and
> .orig files instead of big ugly conflict markers inside the file.
> Emacs has a nice 'diff' mode that is a boon when dealing with
> conflicts this way.
>
> Is there a way to convince cogito/git to leave reject files around?
> What utility is git using to do the merges? Or at least: where should
> I look?

I believe you should be able to get that effect by having a version of "git-merge-one-script" that does "diff -c $2 $3 | patch $1" or "diff -c $2 $1 | patch $3", depending on which you want as the orig. (Or something like that. I'm not sure exactly how to get the conflict files out of the script and into the right place, or the arguments it gets.)

Of course, you'll probably have more conflicts to deal with, because the merging code gets less information that way. (In particular, you'll lose the "already contains changes" behavior, so you'll be unhappy if you have patches merged upstream.)

	-Daniel
*This .sig left intentionally blank*