Git Flow

Links

Original Post

Use this directly with git bash

Guidelines

• master is always stable
• develop is the active development branch
• Bugs on master are fixed with hotfix/<branchname>
• Features and Issues are developed on feature/<branchname> and issue/<branchname>
• From develop to stable release, use a release/<version> branch.

Developing a feature

1. branch from develop to feature/<branchname>
2. commit to this branch
3. when done (or partially done but apparently stable) git merge --no-ff to develop

Releasing a version

1. branch from develop to release/<version>
2. only bugfixes commit to this branch
3. when done (tested, unit tested, stable) git merge --no-ff to master and git merge --no-ff to develop

Bugs on master

1. branch from master to hotfix/<issue>
2. only bugfixes commit to this branch
3. when done git merge --no-ff to master and git merge --no-ff to develop