Skip to content

Instantly share code, notes, and snippets.

@karrikas
Created May 24, 2018 15:27
Show Gist options
  • Save karrikas/4c0b3e20a2e24010e314edb3da2487fb to your computer and use it in GitHub Desktop.
Save karrikas/4c0b3e20a2e24010e314edb3da2487fb to your computer and use it in GitHub Desktop.
# create a new branch
git checkout -b feature/example
# do some changes
# udpate master
git checkout master
git pull origin master
# rebase with master
git checkout feature/example
git rebase -ip master
# merge to master
git checkout master
git merge --no-ff feature/example
# clean old branches
git branch -d feature/example
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment