Use of Git

We aim not to make long and complicated rules for using Git, but we (and apache) want to have transparency, so a few rules is needed

History

Do not rewrite history on our branches, we want to have a liniar history without manipulation

Branches

We use 2 branches constantly:

• master This is our development branch, commit code to this branch whenever you have finished developing and testing a feature. Every commit on this branch, must be verified and tested on the platform the committer uses, do NOT commit non working versions here.
• stable This is our release branch, whenever HEAD on master is tested on all platforms the content is merged to stable, therefore stable is a timeline where corinthia worked on all supported platforms. do NOT commit to stable without previous agrement on dev@

If you make changes to any API or work on a bigger feature make an "experimentXYZ" remote branch, in order for other developers to view your code before committing it to master

Use a local work branch while you develop, once you have finalized and tested the feature/bug fix, merge it with --squash to master

Workflows (examples)

Please see Git FAQ