Ezio Melotti added the comment: The attached patch fixes the typo and mentions ``hg heads <branch>``.
> I think a version of your 6 step display would be helpful. It was for me. The FAQ already describes the general approach (merge heads in each branch and then merge branches as usual). The worst-case scenario that those 6 steps address is something that doesn't really happen often (and it's also a bit intimidating), so I preferred to leave it out and just describe a more common example. ---------- Added file: http://bugs.python.org/file29406/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
