I---J---K (topic)
/
E---F---G---H (dev)
/
A---B---C---D (master)
Developer contribution guidelines
Branch organisation
-
master : the main branch. It stores all the public commit log and tag (mapped to release). It must never be "pushed force".
-
dev : the next release integration branch.
-
my-topic : a topic branch for a particular project. It must be rebased as often as possible on dev branch
1. Derive topic from dev
Note
|
Each new evolution project must be isolated on a dedicated topic branch. |
2. Isolation test : Rebase topic on dev. Test your evolution
I---J---K---L---M (topic)
/
E---F---G---H (dev)
/
A---B---C---D (master)
3. Integration test : Merge topic in dev. All dev's evolution will be test together
E---F---G---H---I---J---K---L---M (topic, dev)
/
A---B---C---D master
4. Packaging : Merge dev on master. Tag the HEAD of master with the next release label
A---B---C---D---E---F---G---H---I---J---K---L---M (topic, dev, master, NEXT_RELEASE_LABEL)