➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author ezio.melotti
Recipients chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, ned.deily, pitrou, python-dev, sandro.tosi, terry.reedy, tshepang
Date 2013-03-13.07:29:38
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1363159780.05.0.331372390844.issue14468@psf.upfronthosting.co.za>
In-reply-to
Content 
The attached patch adds 3 new FAQs:
 * How do I solve merge conflicts?
 * How do I make a null merge?
 * I got "abort: push creates new remote heads!" while pushing, what do I do?

It also replaces the overly generic "How do I find out which revisions need merging?".
The content of "How do I list the files in conflict after a merge?" and "How I mark a file resolved after I have resolved merge conflicts?" has been summarized in "How do I solve merge conflicts?" too, so I removed them.
History
Date User Action Args
2013-03-13 07:29:40ezio.melottisetrecipients: + ezio.melotti, terry.reedy, ncoghlan, pitrou, ned.deily, eric.araujo, sandro.tosi, chris.jerdonek, tshepang, python-dev
2013-03-13 07:29:40ezio.melottisetmessageid: <1363159780.05.0.331372390844.issue14468@psf.upfronthosting.co.za>
2013-03-13 07:29:39ezio.melottilinkissue14468 messages
2013-03-13 07:29:38ezio.melotticreate