[resend after some problems related to the weekend A/C shutdown in MPK17]
Thanks for the comments!
>>>>> "David" == David Bustos <David.Bustos at sun.com> writes:
>> "It is highly recommended that you review the results of a
>> merge before committing it...":
David> I think you should state how to determine {which files have
David> changed, what the diffs are, and maybe how to generate a webrev}
David> relative to each head.
I've added a bunch of text and a couple examples here.
David> Merging with uncommitted changes: Should you mention that if the
David> changes aren't committed, then there's no way to rerun the merge,
David> like you can if they were committed?
I added a note about this to the Best Practices section "Always commit
your work before you merge".
David> Running a project gate
I'd like to defer any changes here. There's a lot that could be written
on this topic, and we (the SCM Migration team) have been talking about
doing it on genunix, so that project teams can add tips without us being
a bottleneck.
Draft 2 and diffs are now available at
http://cr.opensolaris.org/~kupfer/on-readme/ .
mike
