Hi, I have a simple merge conflict use case:
$ mkdir foo $ cd foo/ $ git init $ echo line1 > a $ git add . $ git commit -q -m init $ echo line2 >>a $ git commit -a -q -m "add line2" $ git checkout -b foo HEAD~1 $ git cherry-pick -x master $ echo line3 >>a $ git stage a $ git commit -q -m "add line3" $ git checkout master $ git merge foo $ git diff diff --cc a index c0d0fb4,83db48f..0000000 --- a/a +++ b/a @@@ -1,2 -1,3 +1,6 @@@ line1 line2 ++<<<<<<< HEAD ++======= + line3 ++>>>>>>> foo Why does git think there's a conflict here since the "line2" string was added in both branch by the same commit ? Thanks. -- Francis -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
