Skip to content

Instantly share code, notes, and snippets.

@imRohan

imRohan/Fix a Foxtrot Merge

Created August 27, 2020 13:45
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 imRohan/33c24a474644c87040927f2c0f480b28 to your computer and use it in GitHub Desktop.
Save imRohan/33c24a474644c87040927f2c0f480b28 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Fix a Foxtrot Merge
`git pull origin [main_branch_name]`
`git checkout [merge_branch_name]`
`git pull origin [main_branch_name] --rebase`
`git push -f origin [merge_branch_name]`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment