Never use git pull

  • Always try git pull --rebase first, if it works, done!
  • If get a merge conflict, undo everything with git rebase --abort
  • Just pull normally using git pull