On Mon, Jun 04, 2012 at 11:32:06AM -0500, Kevin Brannen wrote: > I believe I've just found a bug in "merge", specifically in the > "recursive" strategy. (Or really, here's another example of and > hopefully more info on a known bug.) Oh, this is with 1.7.2.3, the > latest I'm able to use on this machine. > [...] > So I think the problem is just too many renames/moves of the same > object and when "recursive" descends the tree, it just can't handle > that correctly -- or that's my guess. :) There were a large number of merge-recursive corner cases fixed, especially around renames, in the 1.7.3, 1.7.4, and 1.7.7 versions of git. I do not recall specially a bug that matches your description, but I would not be surprised at all if was already fixed by existing changes. Can you try to reproduce with a more recent version of git (preferably the current "master" branch)? -Peff -- 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