$ git fetch
$ git rebase origin/master
If you experience merge conflicts:
$ git status
Fix merge conflicts.
$ git add .
$ git rebase --continue
If there's nothing to be fixed and rebase is still active use
$ git rebase --skip
If you experience merge conflicts go back to $ git status
Once all is fixed:
$ git push --force-with-lease
Done!