Changes between Version 28 and Version 29 of WorkingConventions
- Sep 7, 2007 11:15:56 AM (7 years ago)
v28 v29 32 32 * If possible, push often. This helps to avoid conflicts. 33 33 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]). 39 35 40 36 * Every patch must pass at least minimal validation: see TestingPatches.