Message184140
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. |
|
Date |
User |
Action |
Args |
2013-03-14 07:38:54 | ezio.melotti | set | recipients:
+ ezio.melotti, terry.reedy, ncoghlan, pitrou, ned.deily, eric.araujo, sandro.tosi, chris.jerdonek, tshepang, python-dev |
2013-03-14 07:38:54 | ezio.melotti | set | messageid: <1363246734.67.0.539912077994.issue14468@psf.upfronthosting.co.za> |
2013-03-14 07:38:54 | ezio.melotti | link | issue14468 messages |
2013-03-14 07:38:54 | ezio.melotti | create | |
|