Skip to content

Instantly share code, notes, and snippets.

@kevcoxe

kevcoxe/Git rebase merge conflicts

Created July 15, 2020 14:44
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 kevcoxe/2419175374ec0f073296bcea3e701229 to your computer and use it in GitHub Desktop.
Save kevcoxe/2419175374ec0f073296bcea3e701229 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git rebase merge conflicts
git rebase origin/master
# fix conflicts
git add -A
git rebase --continue
git push --force
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment