Instantly share code, notes, and snippets.
Instead of using git pull use
git pull
git pull --rebase
and in case of conflicts use
git rebase --abort