git/list[1] front-page[2] threads[3] people[4] search[5] about
 

how to work in hirarchical git model?

From
GPGili Pearl <gili.pearl@yahoo.com>
Date
Dec 16, 2008, 22:26 UTC
Message-ID
<703400.93370.qm@web112210.mail.gq1.yahoo.com>
[Not sure I'm posting to the right mailing list; sorry in advance]

I’m working in a small company with about 15 developers. So far we were all rebasing our local repos on a single main repo. When one had some new commits, he rebased them on the main-repo/master and asked the main-repo maintainer to pull them in. So far so good, but we now considering moving into a three level model, where we’ll have sub-maintainers that will handle local merges before they hit the main-repo. I’m not sure I understand how this is supposed to work and I’d be thankful to get some advice.

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. I can understand that the problem is because commit L had become L', and now low-level1 cannot find L anymore, i.e. now it looks like this:

top-level : A----B----C----D
                            \
                             \
mid-level1:                   K'----L'----M'
                          \
                           \
low-level1:                 X----Y

... but I guess this is not how it should work. So what is the right working flow for us?

Thanks.
      
Next: Johannes Sixt
Message 1 of 8 in “how to work in hirarchical git model?”
  1. Gili PearlDec 16, 2008
  2. Johannes SixtDec 17, 2008
  3. Gili PearlDec 17, 2008
  4. Johan HerlandDec 17, 2008
  5. Gili PearlDec 17, 2008
  6. Gili PearlDec 17, 2008
  7. Johan HerlandDec 18, 2008
  8. Johannes SixtDec 17, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.