[Python-checkins] devguide: Some more advice about merges.

[georg.brandl]

http://hg.python.org/devguide/rev/5d7759157a67
changeset:   475:5d7759157a67
user:        Georg Brandl <georg at python.org>
date:        Fri Jan 13 22:03:32 2012 +0100
summary:
  Some more advice about merges.

files:
  committing.rst |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -12,6 +12,9 @@
 * Do **not** do cosmetic changes to unrelated code in the same commit as some
   feature/bugfix.
 
+It is of course okay to pile up several commits to one branch and merge them
+into another in one merge commit.
+
 
 Patch Checklist
 ---------------

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