git used to be really good at merging 2 branches that had gotten the same code added independently. Right now, both master (1.5.3.5.737.gdee1b) and next (9445b41) are telling me that the exact same file (same sha1), with the same mode added on 2 branches is a merge conflict. On _one_ of the branches there is an extra commit. Hmmm. I am pretty sure that early git (pre 1.0) could handle this correctly. I remember sending git-archimport to Junio and immediately doing 3 or 4 commits on top, and having the next pull work correctly without conflict because the merge machinery spotted the "last common sha1" for that file and saw that only one side had changed since then. Happens with recursive and resolve. Happy to provide a minimal repro case, but I think this is fairly obvious... cheers, martin - 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
