git: rebase vs pull/merge

  • Instead of a normal pull, try this:

git pull --rebase origin master

git add <some-file>
git rebase --continue
  • To abort:
git rebase --abort
  • Finally:
git push origin master

Leave a Reply