I have a problem when manipulating git pull. Consider I have 2 branches on my remote (origin) repository : A and B.
The remote B branch is ahead of the local B branch by 1 commit.
This additional commit (on the remote B branch) just add a new file, say "newfile".
In my local branch A, I have a file "newfile" and its content is different from the one of the remote B branch.
Then, I run this commands:
git checkout A git pull origin B:B
I can see the following behavior: the branch B is updated as I expected. B has been fast-forwarded, and then contains "newfile". But I also have a conflict on "newfile". and in my current directory, the file "newfile" contains the conflicts markers.
Why is there a conflict while the merge has already been done ?