Re: [Gnu-arch-users] Smart Merging with Multiple Branches From a Common Ancestor

[Tom Lord]

    > From: John Goerzen <address@hidden>

    > I'm going to try to explain this question that's a little fuzzy in my
    > head as clearly as possible.  Please ask if I fail :-)
    [extended example]

I think you want to use the --reference option to star-merge when
merging into baz from foo and bar (`--reference mainline').

I also suspect that when you created foo--patch-3, you really wanted
to do something like:

        tla get mainline--patch-2  wd
        cd wd
        tla sync-tree foo
        tla set-tree-version foo
        tla commit

but it really comes down to what you want to see in `whats-missing'
output.

-t