Changes between Version 28 and Version 29 of WorkingConventions


Ignore:
Timestamp:
Sep 7, 2007 11:15:56 AM (7 years ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions

    v28 v29  
    3232 * If possible, push often.  This helps to avoid conflicts. 
    3333 
    34  * Rather than push conflicting patches followed by conflict resolutions, use 
    35    amend-record (or unrecord/edit/record) to make a single patch.  Darcs currently 
    36    doesn't handle conflicts 
    37    well, so we are trying to keep the HEAD clean of conflicts for now.  It doesn't 
    38    matter so much on the stable branches though. 
     34 * Do not push conflicts (see [wiki:WorkingConventions/Darcs#Conflicts]). 
    3935 
    4036 * Every patch must pass at least minimal validation: see TestingPatches.