Skip to content

Instantly share code, notes, and snippets.

@andrewmcodes
Created December 16, 2021 04:03
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save andrewmcodes/0433ce80a8734972951355814ac71b1b to your computer and use it in GitHub Desktop.
Save andrewmcodes/0433ce80a8734972951355814ac71b1b to your computer and use it in GitHub Desktop.
Rebase Feature Branch Against Main

Starting on the feature branch:

git checkout main
git pull
git checkout -
git pull --rebase origin main
git push -f

If you have conflicts, you can fix them during the rebase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment