Re: Resolving conflicts

From: Linus Torvalds <torvalds@osdl.org>
Date: Dec 2, 2006, 04:30 UTC
Message-ID: <Pine.LNX.4.64.0612012018490.3476@woody.osdl.org>
In-Reply-To: <456FDF24.1070001@saville.com>

[ Tangentially related.. ]

On Thu, 30 Nov 2006, Wink Saville wrote:

> 
> Earlier had a problem with git wanting merge but didn't have it and
> couldn't figure out which package it was in Ubuntu:( So I symlinked merge
> to kdiff3 which worked at the time:

Btw, what's the status of the xdl_merge() thing in "pu"?

It would be lovely if this could be one less thing we ever need to worry about, just because we just do it ourselves. But quite frankly, I've never looked at the RCS merge logic, so while I peeked at the xdl_merge patch itself, I have absolutely zero way of judging it.

But the patch in "pu" to make merge-recursive use it looks pretty, and removes more lines than it adds, and the xdl_merge() code itself _looked_ sane even if I can't judge the algorithm, so...

Anyway, here's one vote for trying to move this thing into "next" (first asking whether all of Dscho's fixup patches got merged too?).

I realize that git-cvsserver (and my toy merge-file.c that isn't used by anything real) also use the external merge program, so we can't remove the dependency entirely (both in git.spec.in and documentation) without fixing those too, but at least we would _practically_ be able to ignore it for all normal users. And cvsserver would probably be quite fixable too..