Jeff King <peff@xxxxxxxx> writes: > I'm not sure if we were ever using merge-recursive like that. Especially > with Elijah's latest patches to handle worktree dirtiness better, I > wouldn't be surprised if it has issues. I am parsing the above as "seeing the need for such an extensive fix-up, it is not surprising if the base code is broken", and I have to agree. In principle, "git merge" should be usable in an empty working tree in the sense that with correctly populated index the absense of the working tree file is _meant_ to be treated the same as having the file unchanged from the index and the HEAD version, but I suspect that "merge-recursive" is pretty much broken with that regard. I have much more faith in "git merge -s resolve" performing correctly. -- 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