Message184140
| Author |
ezio.melotti |
| Recipients |
chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, ned.deily, pitrou, python-dev, sandro.tosi, terry.reedy, tshepang |
| Date |
2013年03月14日.07:38:54 |
| SpamBayes Score |
-1.0 |
| Marked as misclassified |
Yes |
| Message-id |
<1363246734.67.0.539912077994.issue14468@psf.upfronthosting.co.za> |
| In-reply-to |
| Content |
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. |
|