Comment by nunull

    $ git pull origin master
    Your local changes to the following files would be overwritten by merge: user.abcd.suo

Suggestion: git rm --cached user.abcd.suo

Wooaa, no! (Now your local changes are gone.)