From: Johannes Sixt <j.sixt@viscovery.net>
To: Gili Pearl <gili.pearl@yahoo.com>
Cc: git@vger.kernel.org
Subject: Re: how to work in hirarchical git model?
Date: Wed, 17 Dec 2008 08:32:36 +0100 [thread overview]
Message-ID: <4948AB14.8030004@viscovery.net> (raw)
In-Reply-To: <703400.93370.qm@web112210.mail.gq1.yahoo.com>
Gili Pearl schrieb:
> 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
next prev parent reply other threads:[~2008-12-17 7:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-16 22:26 how to work in hirarchical git model? Gili Pearl
2008-12-17 7:32 ` Johannes Sixt [this message]
2008-12-17 8:23 ` Gili Pearl
2008-12-17 8:33 ` Johan Herland
2008-12-17 8:44 ` Gili Pearl
2008-12-17 22:59 ` Gili Pearl
2008-12-18 1:00 ` Johan Herland
2008-12-17 8:48 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4948AB14.8030004@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=gili.pearl@yahoo.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).