Little story, about how i get things fucked up.
I've been working for two nights on some project, and we have notifications in slack about new commits, and i've been working for myself, not pulling any commits for this time, cause no notifications 've been received, and then when i've tried to commit&push i've realized that there is 14 commits before me, and someone just accidentally turned off notifications :C

git pull --rebase

And while working on a feature branch (that I own) I also like to constantly rebase against the remote's master. (If it's a shared branch, don't rebase. I don't like to work on shared branches.) That way, I always get the current state, resolve merge conflicts before I issue a pull request.

Furthermore, I have a git plugin active that shows me on my terminal if the remote has some commits ahead of me.