Re: Merge-Recursive Improvements

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 13, 2008, 00:05 UTC
Message-ID: <alpine.LSU.1.00.0802130003370.3870@racer.site>
In-Reply-To: <alpine.LFD.1.00.0802121544370.2920@woody.linux-foundation.org>

Hi,

On Tue, 12 Feb 2008, Linus Torvalds wrote:

Show 13 quoted lines

> On Tue, 12 Feb 2008, Voltage Spike wrote:
> > 
> > First, git is overly zealous at merging differences and two functions 
> > added at the same point in a file become intertwined during the merge. 
> > A trivial example of this behavior:
> 
> Hmm. Have you tested what happens if you use XDL_MERGE_EAGER instead of 
> XDL_MERGE_ZEALOUS in the "level" argument to xdl_merge() in 
> merge-recursive.c?
> 
> (No, I didn't test it myself, but it may get you the behaviour you want, 
> and we could make it a config option for people who want a less 
> aggressive merge)

Actually, I have this in my ever-growing TODO:

XDL_MERGE_ZEALOUS_ALNUM: require an alnum in the common code; otherwise do 
not de-conflict it.

In other words, if there is a hunk consisting of conflicting lines, which are identical, but have no letter and no number in it, then keep them as conflicts.

But I never got around to try it.

Ciao, Dscho