Project

General

Profile

Repository » History » Version 2

« Previous - Version 2/43 (diff) - Next » - Current version
Pau Escrich, 11/29/2012 06:06 PM


Repository

Structure

The qMp git repository is split in three branches:

  1. Master
  2. Testing
  3. Other/Features

Master

This is the main branch and all changes committed here must be tested in Testing branch before.

However the small bugfixes can be directly applied here at same time that they are applied to testing branch.

Testing

This is the branch for test new features and changes. The features must be already working features tested before
in a specific branch by at least the developer. A feature can be committed here only when it is finished, but not
in a middle state.

Other/Features

The rest of the branches are temporal branches. If it is about a new feature the name of the branch must be
the name of the feature (of some name which identifies it). These branches are considered non-functional, so
a non-finished feature can be committed here. Once the feature is finish and tested by at least the developer,
it should be merged to testing.

How to use it

To merge from one branch to another rebase must be used.
git checkout testing; git rebase new_feature

Good practices