elmentary (watson): merge (named) branches and/or bookmarks

[Bob Hood]

On 12/18/2016 8:24 AM, Bob Hood wrote:
> main --------o-------------o---------o----->
>               \            ^         ^
>                v           |         |
>                o-----------o---------x
>                ^           ^         ^______ merge heads and delete bookmark
>                |           |________________ merge to main, bookmark continues
>                |____________________________ new head createdwith bookmark
>
>

Actually, I meant that to be:

main --------o-------------o---------o----->
               \            |         ^
                v           v         |
                o-----------o---------x
                ^           ^         ^______ merge heads and delete bookmark
                |           |________________ *rebase from main*, bookmark 
continues
                |____________________________ new head created with bookmark


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20161218/b5fdd0ca/attachment-0002.html>