Skip to content

Instantly share code, notes, and snippets.

@iRet

iRet/preparing-release-or-hotfix-with-git-flow.md

Last active September 12, 2016 15:47
Show Gist options
  • Save iRet/3f108d9f6c869919910234ded85b5ca7 to your computer and use it in GitHub Desktop.
Save iRet/3f108d9f6c869919910234ded85b5ca7 to your computer and use it in GitHub Desktop.
Download ZIP
Preparing release or hotfix with git flow
Raw
preparing-release-or-hotfix-with-git-flow.md

Please use git flow cheatsheet as a reference.

Currently we are using following patterns for tag names:

  • release: x.x.x
  • hotfix: x.x.x-hotfix-x

After finishing release or hotfix (with git flow command), please make sure you are pushed tag as well.
You can use git push --follow-tags to push commits and tags at once or git push --tags to push only tags.

Please check tag presence in origin ⚠️

Example:

Let's assume we decided to use 3.1.0-hotfix-1 as hotfix tag

git flow hotfix start 3.1.0-hotfix-1

... add some commits ...

git flow hotfix finish 3.1.0-hotfix-1

(it will merge hotfix branch to master and develop and then will ask for short description of a tag)

git push --follow-tags (on master)
git push (on develop)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment