Projecte

General

Perfil

Repository » Historial » Versió 7

Simó Albert i Beltran, 02-12-2012 14:30
Bugfix branches.

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 6 Simó Albert i Beltran
However the small bugfixes can be directly applied here. These changes must be merged in the testing branch.
16 1 Pau Escrich
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 7 Simó Albert i Beltran
A bugfix must be solved in a new branch. This branch must be based in a commit of the master branch. This branch can't be based in a commit of the testing branch because this branch can has new features, and these new features maybe can't be imported in the master branch. This new branch can be merged in testing.
31
32
<pre>
33
o---o---o---o---o master
34
     \         /
35
      o---o---o issue#23
36
               \
37
o---o---o---o---o testing 
38
</pre>
39 1 Pau Escrich
40
h2. How to use it
41
42 2 Pau Escrich
43
h2. Good practices