[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.)

[OJFord]

And maybe that's desired.

Or maybe it isn't.

The main problem with this, as I see it, is the lack of knowledge of the user's intention.

Without that, it's only good for total basics that built-in correction or 'thefuck' would handle.

With that, well.. that's StackOverflow.