Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

This can fail if upstream is ahead of you local version. In this case you first have to get the most recent changes from upstream:

Here is a blog post that explains the difference between merge and rebase

Code Block
languagebash
themeEmacs
git fetch origin 
git rebase -p origin

...