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

http://stackoverflow.com/questions/25597104/git-pull-error-your-local-changes-to-the-following-files-would-be-overwritten-b

git pull

I get back

error: Your local changes to the following files would be overwritten by merge:
file/name/path
some/more/filenamepath
Please, commit your changes or stash them before you can merge.
Aborting

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