Skip to content

Instantly share code, notes, and snippets.

@fokosun

fokosun/rebasing-to-staging.txt

Last active September 21, 2015 13:17
Show Gist options
  • Save fokosun/a3f73f312255e3e971c4 to your computer and use it in GitHub Desktop.
Save fokosun/a3f73f312255e3e971c4 to your computer and use it in GitHub Desktop.
Download ZIP
How to rebase to staging to fix merge conflicts
Raw
rebasing-to-staging.txt
git checkout staging
git pull origin staging
git status
git checkout <my branch name>
git merge staging
git add .
git status
git commit -m "my commit message"
git status
git push origin
git push origin <my branch name>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment