Ezio Melotti added the comment: 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. ---------- Added file: http://bugs.python.org/file29394/issue14468-new-faqs.diff _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue14468> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
