Skip to content

Instantly share code, notes, and snippets.

@sergii-frost
Last active August 29, 2015 14:07
Show Gist options
  • Save sergii-frost/c06df20de584ae2e5b6c to your computer and use it in GitHub Desktop.
Save sergii-frost/c06df20de584ae2e5b6c to your computer and use it in GitHub Desktop.
Git Flow tips and tricks
  • Having at least 2 branches: master and develop
  • master branch has only released code
  • develop branch has only stable code
  • When working on new feature it is better to create brunch like:
> git checkout -b develop-my-new-cool-feature
  • After work on feature in separate branch is done, it is better to merge it with develop (as other developers could push their features there):
> git merge develop
  • Before release it is good to create tag with:
> git tag -a "tag name - e.g. v2.1" -m "What is new in this release"
  • To push tag to remote:
> git push --tags
  • After tag for release is added, it is good practice to merge code from develop to master before starting work on new release:
> git checkout master
> git merge develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment