Skip to content

Instantly share code, notes, and snippets.

@gabeborges
Last active August 29, 2015 13:56
Show Gist options
  • Save gabeborges/98eb02b72841dc3ddb28 to your computer and use it in GitHub Desktop.
Save gabeborges/98eb02b72841dc3ddb28 to your computer and use it in GitHub Desktop.
#create a new branch
git checkout -b branch-name
#before pushing
git checkout master
git pull origin master
#it goes for the last branch used
git checkout -
#it will show conflicts
git rebase master
- if conclict == true
git add .
git rebase --continue
#abort rebase
git rebase --abort
#create branch-name in repository
git push origin branch-name
#go to bitbucket or git and ask for PR from branch-name to master branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment