Git pull error: Your local changes to the following files would be overwritten by merge:

Question

I am trying to pull changes from remote branch but getting an error which doesn\'t make sense

when I do

git pull

I get back

<

Answer 1

You should:

• fetch (updating all remote tracking branches, like origin/master)
• rebase your current branch on top of origin/master in order to replay your 2 commits on top of the 7 updated commits that you just fetched.

That would be:

git checkout master
git fetch
git rebase origin/master

A shorter version of the above set of commands would be the following single command:

git pull --rebase