Git says local branch is ahead of remote after having pulled from remote

Question

I’m sorry if the title isn’t clear, but this is a weird problem.

I git checkout to my \"stage\" branch and git pull to get my partner’s latest

Answer 1

I got the similar problem now after the following had happened:

• My collegue pushed a simple commit
• I pulled that commit, my tool has marked "Commit merged changed immediately"
• My collegue decides to do an --amend to change his original commit so that it becomes two different commits instead
• I pulled that changes, ending up being three commits ahead of origin

My simple solution was to undo these three local commits, running the following command for each commit:

git reset --soft HEAD~1

Then git status tells I am behind origin with two commits, and I can pull those commits as usual.