Repository » Historial » Revisió 2
Revisió 1 (Pau Escrich, 29-11-2012 18:04) → Revisió 2/43 (Pau Escrich, 29-11-2012 18:06)
h1. Repository h2. Structure The qMp git repository is split in three branches: # Master # Testing # Other/Features h3. 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. h3. 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. h3. 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. h2. How to use it To merge from one branch to another rebase must be used. @git checkout testing; git rebase new_feature@ h2. Good practices