Dear Wiki user, You have subscribed to a wiki page or wiki category on "Cordova Wiki" for change notification.
The "CommitterWorkflow" page has been changed by AndrewGrieve: http://wiki.apache.org/cordova/CommitterWorkflow?action=diff&rev1=8&rev2=9 * Again, sometimes this will end with a [[http://www.apache.org/foundation/glossary.html#LazyConsensus|Lazy Consensus]]. == Step 5: Merge your change == - * Once your topic branch is tested & working, it's time to merge it. Use the following workflow: + * Once your topic branch is tested & working, it's time to merge it. + * Use the following logic to determine which branch to merge into: + {{{ + if (inReleaseMode && isBugFix) { + commitToBranch('next'); + mergeBranch('next').into('master'); + } else { + commitToBranch('master'); + } + }}} + + * Here is an example workflow: {{{ git checkout master
