Re: What does it mean to have multiple upstream tracking branches?

[Tao Klerks <tao@klerks.biz>]

On Thu, Mar 3, 2022 at 11:24 PM Glen Choo <chooglen@google.com> wrote:
>
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
> >
> > Can you point out some existing tests where we end up with multiple
> > *.merge values? I looked a bit and couldn't find any.
> >
> > Or maybe it's only possible to get into that state with some command we
> > have a test blind spot for?
>
> Based on the discussion on that thread you mentioned, I don't think we
> have any such tests. I think the only way to get into this state is to
> manually modify the config.

There is now a way to get into such a state for a new branch, assuming
you were in such a state for an existing branch, and that is to use
"--track=inherit" when creating a new branch, branching from one
previously manually set up that way.

>
> The only docs I could find on 'multiple values' are from
> Documentation/config/branch.txt:
>
>   branch.<name>.merge::
>     [...]
>     Specify multiple values to get an octopus merge.
>

Cool, hadn't seen that, thank you.