Skip to content

Git Workflow

Jump to bottom Edit New page
Markus W edited this page Aug 12, 2013 · 3 revisions

Branches

  • master (release branch)
    • Should be used for consistent versions that belong together (e.g. sprint releases). Do not use as development master
  • DataGenerator (Java)
    • Development branch Data Generator
  • SensorService (Java)
    • Development branch Mobilis Server Part for ACDSense
  • SensorClient (Objective-C)
    • Development branch iOS App for ACDSense

Scenario

Branch master is intended to work as release branch. When all components reach a consistent version that belong together (e.g. sprint results) all these component's branches should be merged and committed on master branch.

![Git Workflow](https://www.evernote.com/shard/s42/sh/edee2ae0-d046-4695-a9be-992647226a76/56673427a1cce11807f6e34d699ac19b/deep/0/ACDSense%20(Git)

In the picture there is an initial commit on the master branch. Later all the components are modified independently within their branches. Finally they reach a consistent version (top-most entry). A download/checkout of the master branch contains a consistent state of all versions.

git checkout master
git merge DataGenerator SensorService SensorClient
Add a custom footer
Add a custom sidebar
Clone this wiki locally