Skip to content

Git Branching Strategy

nairdo edited this page Jan 10, 2013 · 6 revisions

Rock is using a branching model described by Vincent Driessen now called Gitflow. You can read more about Gitflow and Vincent’s corresponding Git extensions on the GitHub git-flow project. There is also a good 6 minute high-level overview video if Gitflow is new to you.

Rock Branching Details

Once you have an understanding of Gitflow, read our Git Branching document which describes in detail exactly how we want you to operate.

Branch Naming Conventions

Type | Format | Example
---- | ------ | -------
Feature | feature-[your_initials]-[name-of-feature] | feature-drt-add-campus
Release | release-[version-number] | release-1.0
Hotfix | hotfix-[version-number] | hotfix-1.0.1
Custom | custom-[organization domain] | custom-ccvonline
Clone this wiki locally