Projecte

General

Perfil

Repository » Historial » Versió 22

Simó Albert i Beltran, 29-12-2012 12:49
Example 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 22 Simó Albert i Beltran
*Example:*
24
@
25
git checkout testing
26
git merge master
27
@
28
29
30 1 Pau Escrich
h3. Testing
31
32 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.
33 1 Pau Escrich
34 15 Simó Albert i Beltran
When the testing branch are deeply tested by more than one developer, than it can be merged on the master branch.
35 11 Simó Albert i Beltran
36
<pre>
37
o---o---o---o---o master
38
     \         /  
39
--o---o---o---o testing 
40
</pre>
41
42 16 Pau Escrich
*Example:*
43 11 Simó Albert i Beltran
44 16 Pau Escrich
Import master bugfixes to testing
45 18 Pau Escrich
@
46 16 Pau Escrich
git checkout master
47
git checkout testing
48
git merge master
49 18 Pau Escrich
@
50 16 Pau Escrich
51
Merge testing changes in master
52 19 Pau Escrich
@
53 16 Pau Escrich
git checkout master
54
git merge testing
55 19 Pau Escrich
@
56 16 Pau Escrich
57 12 Simó Albert i Beltran
h3. Other: Features/Bugfixes
58 1 Pau Escrich
59 8 Simó Albert i Beltran
The rest of the branches are temporal branches.
60
61 14 Simó Albert i Beltran
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. This branch should preferably be based on a commit of master branch. Once the feature is finish and tested by at least the developer, it should be merged to testing.
62 1 Pau Escrich
63 9 Simó Albert i Beltran
<pre>
64
o---o---o---o---o master
65 14 Simó Albert i Beltran
     \
66 9 Simó Albert i Beltran
      o---o---o issue#23-new-feature
67 14 Simó Albert i Beltran
               \
68 9 Simó Albert i Beltran
o---o---o---o---o testing 
69
</pre>
70
71 16 Pau Escrich
*Example:*
72 9 Simó Albert i Beltran
73 21 Pau Escrich
A bugfix must be implemented in a new branch. This branch must be based on a commit of the master branch. This branch should not be based on a commit of the testing branch because it may contain new features and these maybe cannot be imported in the master branch. This new branch can be merged in testing.
74 7 Simó Albert i Beltran
75
<pre>
76
o---o---o---o---o master
77 1 Pau Escrich
     \         /
78 9 Simó Albert i Beltran
      o---o---o issue#23-bugfix
79 7 Simó Albert i Beltran
               \
80
o---o---o---o---o testing 
81
</pre>
82 16 Pau Escrich
83
*Example:*
84 1 Pau Escrich
85
h2. How to use it
86
87 2 Pau Escrich
88
h2. Good practices