Repository Structure

Jump to bottom Edit New page

t-oster edited this page Mar 25, 2013 · 2 revisions

I use the "git flow" branching model. In detail this means:

The "master" branch contains the code corresponding to the latest release, so it's head is always pointing to a tagged commit like "1.4"
The "develop" branch contains the newest runnable version and is the place where the integration happens. Small updates are done directly in the "develop" branch, whereas more complicated features get their own "feature"-branch and get merged to "develop" as soon as they are working.

Please use "develop" as starting-point for every development and pull-request (except if you are working on a public feature-branch)