cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Cordova Wiki] Update of "CommitterWorkflow" by AndrewGrieve
Date Wed, 20 Feb 2013 19:49:51 GMT
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=10&rev2=11

  } else {
      commitToBranch('master');
  }
+ }}}
+ 
+  * Here is an example workflow for fixing a regression by merging in a local topic-branch:
+ 
+ {{{
+ git checkout next
+ git pull apache
+ git checkout topic_branch
+ git rebase next -i
+ git checkout next
+ git merge --ff-only topic_branch
+ git push apache next
+ git branch -d topic_branch
+ git checkout master
+ git merge next
+ git push apache master
  }}}
  
   * Here is an example workflow for a non-regression commit where the top_branch is a remote
branch:

Mime
View raw message