Repository » Historial » Versió 1
Pau Escrich, 29-11-2012 18:04
| 1 | 1 | Pau Escrich | h1. Repository |
|---|---|---|---|
| 2 | |||
| 3 | h2. Structure |
||
| 4 | |||
| 5 | The qMp git repository is split in three branches: |
||
| 6 | |||
| 7 | # Master |
||
| 8 | # Testing |
||
| 9 | # Other/Features |
||
| 10 | |||
| 11 | h3. Master |
||
| 12 | |||
| 13 | This is the main branch and all changes committed here must be tested in Testing branch before. |
||
| 14 | |||
| 15 | However the small bugfixes can be directly applied here at same time that they are applied to testing branch. |
||
| 16 | |||
| 17 | h3. Testing |
||
| 18 | |||
| 19 | This is the branch for test new features and changes. The features must be already working features tested before |
||
| 20 | in a specific branch by at least the developer. A feature can be committed here only when it is finished, but not |
||
| 21 | in a middle state. |
||
| 22 | |||
| 23 | h3. Other/Features |
||
| 24 | |||
| 25 | The rest of the branches are temporal branches. If it is about a new feature the name of the branch must be |
||
| 26 | the name of the feature (of some name which identifies it). These branches are considered non-functional, so |
||
| 27 | a non-finished feature can be committed here. Once the feature is finish and tested by at least the developer, |
||
| 28 | it should be merged to testing. |
||
| 29 | |||
| 30 | |||
| 31 | h2. How to use it |
||
| 32 | |||
| 33 | To merge from one branch to another rebase must be used. |
||
| 34 | @git checkout testing; git rebase new_feature@ |