Development Procedure¶

1) git-flow¶

1. Setup¶

OSX:
Homebrew

$ brew install git-flow

Macports

$ port install git-flow

Linux

$ apt-get install git-flow

Windows (Cygwin)

$ wget -q -O - --no-check-certificate https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash

2. Getting started - Initialize¶

$ git flow init

3. Features¶

Start a new feature :

$ git flow feature start MYFEATURENAME

Publish a feature :
Publish a feature to the remote server so it can be used by other users.

$ git flow feature publish MYFEATURENAME

Getting a published feature :

$ git flow feature pull origin MYFEATURENAME

Finish up a feature :

$ git flow feature finish MYFEATURE
$ git push origin develop          // for push in 'develop' branch
// If you don't want execute build
$ git push origin develop --commit=[CI SKIP]

4. Make a release¶

Start a release :

$ git flow release start RELEASENAME    // !!! tags = RELASENAME
$ git flow release publish RELEASENAME

Finish up a release :

$ git flow release finish RELEASENAME
$ git push --tags

5. Hotfixes¶

git flow hotfix start :

$ git flow hotfix start VERSION

Finish a hotfix :

$ git flow hotfix finish VERSION