I know how to solve this:
user@host$ git pull Updating 9386059..6e3ffde error: Your local changes to the following files would be overwritten by merge: f
To save few seconds for oncoming explorers, here is a summary (thanks to @VonC):
git pull --rebase --autostash