[New-bugs-announce] [issue16517] address merge conflicts in devguide null-merge instructions

[Chris Jerdonek]

New submission from Chris Jerdonek:

The null-merge instructions in the devguide (in the "note" box in the section linked to below):

http://docs.python.org/devguide/committing.html#porting-within-a-major-version

are incomplete if the merge created conflicts.  It would help to include instructions on how to resolve this scenario.  Proposed patch attached.  (Am I right that the `hg resolve` is required?)

[Also adding David since this or a related topic came up with him on IRC a couple(?) months back.]

----------
assignee: chris.jerdonek
components: Devguide
files: issue-null-merge-1.patch
keywords: easy, patch
messages: 176041
nosy: chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, r.david.murray
priority: normal
severity: normal
stage: patch review
status: open
title: address merge conflicts in devguide null-merge instructions
type: enhancement
Added file: http://bugs.python.org/file28059/issue-null-merge-1.patch

_______________________________________
Python tracker <report at bugs.python.org>
<http://bugs.python.org/issue16517>
_______________________________________