os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add suggestions for conflict resolution.

Browse source 
Submitted by:	wes
Reviewed by:	grog, imp
This commit is contained in:
Will Andrews 2003-02-08 23:43:56 +00:00
parent 0306ec784e
commit 0e579ad8f2
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=15956
1 changed files with 27 additions and 3 deletions

30
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -608,11 +608,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.154 2003-02-08 23:43:56 will Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.153 2003-02-01 17:45:58 keramida Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.154 2003-02-08 23:43:56 will Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.154 2003-02-08 23:43:56 will Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1035,6 +1035,30 @@ checkout -P</programlisting>
erupting, you may also wish to consider backing the change out
again until the matter is settled. Remember &ndash; with CVS we
can always change it back.</para>
<para>Don't impugn the intentions of someone you disagree with.
If they see a different solution to a problem than you, or even
a different problem, it's not because they are stupid, because
they have questionable parentage, or because they are trying to
destroy your hard work, personal image, or FreeBSD, but simply
because they have a different outlook on the world. Different
is good.</para>
<para>Disagree honestly. Argue your position from its merits,
be honest about any shortcomings it may have, and be open to
seeing their solution, or even their vision of the problem,
with an open mind.</para>
<para>Accept correction. We're all fallible. When you've made
a mistake, apologize and get on with life. Don't beat up
yourself, and certainly don't beat up others for your mistake.
Don't waste time on embarassment or recrimination, just fix
the problem and move on.</para>
<para>Ask for help. Seek out (and give) peer reviews. One of
the ways open source software is supposed to excel is in the
number of eyeballs applied to it; this doesn't apply if nobody
will review code.</para>
</sect1>
<sect1 id="gnats">