Hi, On Tue, 12 Feb 2008, Linus Torvalds wrote: > 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
