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

Potential problems with rebasing branch foo onto master, if master was previously merged into foo?

From
Dun Peal <dunpealer@gmail.com>
Date
Feb 4, 2011, 18:28 UTC
Message-ID
<AANLkTina+mXQ0dx+Xx300vcETgsEtHj-Jx0-OfzxywKC@mail.gmail.com>

I'm designing a workflow for a long-lived feature branch `foo`. This branch will have `master` merged into about once day. About once a week, we rebase `foo` back into `master`.

Are there any problems to be expected in this workflow? I have a hunch the rebase back into `master` might be subject to potential problems that I can't foresee.

I should mention that over 70 developers will be collaborating on `foo`, spread across multiple, widely diverging timezones; any state that requires all of these developers to coordinate / synchronize will be prohibitively expensive for us.

Thanks, D
Message 1 of 1 in “Potential problems with rebasing branch foo onto master, if master was previously merged into foo?”
  1. Dun PealFeb 4, 2011

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.