I'm fairly new to git. Just a few minutes ago, I performed a merge on two branches; let's call them A and B. I was 'on' branch A; my next command was 'git merge B'. It said there was one conflict, but I looked in the file and there were no conflict markers. I added the file, committed the change, and did the merge command again. "Already up-to-date" is the message I get.

Yet no merge seems to have taken place. Both branches still exist, and both are exactly as they were before the merge.

What did I do wrong? And how can I make these two branches merge successfully?

Thanks.