possibly a spurious conflict in a three way merge

git 2.0.4 on ubuntu 14.04 64 1. new repo 2. commit test.txt to master: line1 line1 3. branch and checkout branch1 4. make and commit the following change to branch1: #line1 #line2 5. checkout master 6. make and commit the following change to master: line1 #line2 7. merge branch1, git sees a

Re: possibly a spurious conflict in a three way merge

Hi, meanlo...@gmail.com wrote: 2. commit test.txt to master: line1 line1 3. branch and checkout branch1 4. make and commit the following change to branch1: #line1 #line2 5. checkout master 6. make and commit the following change to master: line1 #line2 7. merge branch1, git sees a