Git and Github

Branch structure

The branch structure of our project follows a simple structure:

• the main contains only the official releases
• the dev branch is the contains the most up to date version of the sources
• many short lived feature/fix branches that branch (merge) from (to) dev

The following schema shows the idea of the structure

                v10.1     v10.2
 main          --*---------*
                /         /
 dev           *---------*
                \       /|
 merged-feat     *--*--* |
                         \            
 unmerged-fix             *--*--*
                          (work in progress)