Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

Branching and release policy for UnifiedViews internal contributors 
Anchor
branching-release-policy
branching-release-policy

(Taken from http://nvie.com/posts/a-successful-git-branching-model/, where more details may be found)

...

When contributing to the project, you must always create a temporal branch for you contribution. Such branch must be deleted when properly merged back to develop/master branches.

GitFlow

A tool (Git extension), which supports this branching and release policy specified above, see http://danielkummer.github.io/git-flow-cheatsheet/ for details. 

...

For installation guide, please see http://danielkummer.github.io/git-flow-cheatsheet/#setup

 

Branches:

We distinguish the following types of branches. For each branch, we introduce:

...

We also introduce for each branch git flow command, which should be used. 

Feature branches 

Who may create such branches: Internal contributors, Repository managers

...

  1. Creates new feature branch feature/{featureName} based on the develop branch and switches to that branch 
    1. git flow feature start {featureName}
  2. (Optional) If more internal contributors should collaborate on the release, you need to publish the feature branch
    1. git flow feature publish {featureName}
  3. Work on that branch as needed
  4. Merges feature/{featureName} branch back to the develop branch, removes the feature branch, switches to develop branch ((warning) rebase shall not be used)
    1. git flow feature finish {featureName}

Release branches

Who may create such branches: repository managers. Internal contributors may only contribute to the release branched when invited, they may not create release branches

...

See more details here: Releasing & Hotfixing UnifiedViews

Hotfix branches

Who may create such branches: Internal contributors, repository managers

...

See more details here: Releasing & Hotfixing UnifiedViews

Summary

 Summary of all types of introduced branches: 

 

 Summary overview of the git flow commands available: 

...