Changes between Version 3 and Version 4 of UltimateQualityDevelopmentSystem


Ignore:
Timestamp:
11/02/2013 05:45:23 AM (9 months ago)
Author:
exarkun
Comment:

link to a page that exists and talks about merging forward

Legend:

Unmodified
Added
Removed
Modified
  • UltimateQualityDevelopmentSystem

    v3 v4  
    3939rev@charm$ svn diff | less 
    4040}}} 
    41     * (If the patch does not merge cleanly, the reviewer may reassign to the developer to [wiki:MergedForward merge forward] for review.  Branches and patches must always be sufficiently recent that they will apply cleanly to trunk in order to be considered for review). 
     41    * (If the patch does not merge cleanly, the reviewer may reassign to the developer to [wiki:TwistedWithCombinator merge forward] for review.  Branches and patches must always be sufficiently recent that they will apply cleanly to trunk in order to be considered for review). 
    4242    * Note here that the {{{unbranch}}} command (also part of [wiki:Combinator]) merges your current branch ({{{sprocket-123}}}) into your local {{{trunk}}} in {{{Divmod/trunk}}}. Your trunk should be up to date - otherwise you will not be able to use {{{svn diff}}} to see just the new differences, and you will not be able to easily {{{svn revert}}} the merge. 
    4343  * The reviewer runs all automated tests.