Elijah Newren <newren@xxxxxxxxx> writes: > Suggestions? Other than not doing the remove way before the code knows that it is necessary to get rid of the path because there needs to be a directory? No. Personally, I've long given up on d/f conflict codepath in merge-recursive as unsalvageable, short of a total rewrite. As I said in the other message, the patch you sent in is a good enough fix within the context of the current code. -- 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