Projecte

General

Perfil

Repository » Historial » Versió 10

Simó Albert i Beltran, 02-12-2012 14:37
Graphic for master branch.

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 10 Simó Albert i Beltran
<pre>
18
o---o---o---o---o master
19
                 \  
20
--o---o---o---o---o testing 
21
</pre>
22
23 1 Pau Escrich
h3. Testing
24
25 8 Simó Albert i Beltran
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.
26 1 Pau Escrich
27
h3. Other/Features
28
29 8 Simó Albert i Beltran
The rest of the branches are temporal branches.
30
31
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.
32 1 Pau Escrich
33 9 Simó Albert i Beltran
<pre>
34
o---o---o---o---o master
35
36
      o---o---o issue#23-new-feature
37
     /         \
38
o---o---o---o---o testing 
39
</pre>
40
41
42 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.
43
44
<pre>
45
o---o---o---o---o master
46 1 Pau Escrich
     \         /
47 9 Simó Albert i Beltran
      o---o---o issue#23-bugfix
48 7 Simó Albert i Beltran
               \
49
o---o---o---o---o testing 
50
</pre>
51 1 Pau Escrich
52
h2. How to use it
53
54 2 Pau Escrich
55
h2. Good practices