[Python-checkins] devguide: Mention how to resolve conflicts.

[brett.cannon]

brett.cannon pushed 499ed488321b to devguide:

http://hg.python.org/devguide/rev/499ed488321b
changeset:   121:499ed488321b
user:        Brett Cannon <brett at python.org>
date:        Tue Jan 18 11:26:41 2011 -0800
summary:
  Mention how to resolve conflicts.

files:
  committing.rst

diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -31,8 +31,16 @@
 
 This will try to apply the patch to the current branch and generate a commit
 message. You will need to revert ``Misc/NEWS`` and do a new entry (the file
-changes too much between releases to ever have a merge succeed). Once your
-checkout is ready to be committed, do::
+changes too much between releases to ever have a merge succeed). To do a
+reversion, you can either undo the changes::
+
+    svn revert Misc/NEWS
+
+or you can manually fix the issue and tell svn the problem is resolved::
+
+    svn resolved Misc/NEWS
+
+Once your checkout is ready to be committed, do::
 
     svn ci -F svnmerge-commit-message.txt
 

--
Repository URL: http://hg.python.org/devguide