Skip to content

Instantly share code, notes, and snippets.

@dmtw

dmtw/git_workflow_01.txt

Created September 28, 2012 07:26
Show Gist options
  • Save dmtw/3798452 to your computer and use it in GitHub Desktop.
Save dmtw/3798452 to your computer and use it in GitHub Desktop.
Download ZIP
Git workflow
Raw
git_workflow_01.txt
This workflow works best for me:
git checkout -b develop
...make some changes...
...notice master has been updated...
git checkout master
git pull
...bring those changes back into develop...
git checkout develop
git rebase master
...make some more changes...
...commit them to develop...
...merge them into master...
git checkout master
git pull
git merge develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment