...
Master
should become the development branch for the next release (current sprint).master
. This way master
can be used to develop functionality of the next release. All release fixes get merged to release branch and then to master
.master
branch (or release branch if one exists - in this case changes get merged to release branch and then to master
branch). Changes get merged to master
branch of the project Git via patch validation process described at at Contribution ways.master
(or release) branch....
Each sprint development goes in master
branch in project's git repo. At the moment build goes to QA release branch is created out of master, for example:
ignite-1.3.0.
Normally, project repo should contain only master
branch and , very few branches for ongoing releases and commiter's branches ready to be reviewed. Committers and PMC members are in charge to make everyone follow this rule.
...
There are 2 3 way how you can make contribution
+------------+ +---------------+ +-----------------+
...
So, in case, if a patch can't be applied without conflicts on the HEAD of master and the patch has been created by scripts/git-format-patch.sh then a commiter can apply the patch to master by a revision hash, review changes and resolve the conflicts by yourself.
It is legal to create 'ready to be reviewed' branch ignite-XXXX, where XXXX is the number of the JIRA ticket.
Branch should be deleted in case successful or unsuccessful review. Commiters in charge of deleting it's branches.