Elijah Newren <newren@xxxxxxxxx> writes: > ... git can't know that there's a conflict > until after it's tried resolving paths involving newsub/newfile to see if > they are still in the way at the end (and if newsub/newfile is not in the > way at the end, there should be no conflict at all, which did not hold with > git previously). I'll queue this patch to 'pu', but anybody who wrote the above to correctly arriave at the crux of the issue in his analysis would know that this is another band-aid on top of band-aid. The approach merge-recursive takes to first grab the set of directories and files fundamentally is wrong---it should be resolving the paths in-core first and then look at the result to ignore a directory that has become empty. -- 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