Re: how to work in hirarchical git model?

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Dec 17, 2008, 07:32 UTC
Message-ID: <4948AB14.8030004@viscovery.net>
In-Reply-To: <703400.93370.qm@web112210.mail.gq1.yahoo.com>

Gili Pearl schrieb:

Show 15 quoted lines

> Here is one problem I saw when trying to work in the three-level model.
> At some point, I had the following setup:
> 
> top-level : A----B----C----D
>                   \
>                    \
> mid-level1:         K----L----M
>                           \
>                            \
> low-level1:                 X----Y
> 
> The maintainer of mid-level1 has decided that commits K L M are ready to be 
> merged into the top-level repo. So he rebased on top-level before asking 'please 
> pull', but after that the low-level was not able to rebase on the mid-level 
> any more.

In this model, the mid-level1 maintainer should *not* rebase against top-level. Rather, he should ask the top-level maintainer to *merge* K-L-M.

> So what is the right working flow for us?

The only ones who should be allowed to rebase are developers at the lowest level. Everyone else should only pull or merge.

-- Hannes