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=9&rev2=10 * 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) { + if (inReleaseMode && commitFixesRegression) { commitToBranch('next'); mergeBranch('next').into('master'); } else { @@ -56, +56 @@ } }}} - * Here is an example workflow: + * Here is an example workflow for a non-regression commit where the top_branch is a remote branch: {{{ git checkout master - git pull apache master + git pull apache git checkout topic_branch git checkout -b to_be_merged git rebase master -i
