Clemens Buchacher <drizzd@xxxxxx> writes: > 2. merge_trees -> process_entry > > Find possible rename pairs and try to merge renames. Due to the renames, > entries that were classified as b) above can now become of type a). Yes, unfortunately the rename-processing part of merge-recursive is known to be broken wrt things like this. If you want to punt, > Maybe we should disable merging with a dirty work tree altogether, until > we have a solution that is safe to use? this is not the way to go, as "resolve" is perfectly safe. It would make more sense to disable the rename-processing part of recursive by default, until it gets cleaned up further. -- 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