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

Re: Workflow question: Topic -> Next w/ frequent API changes

From
Jon Seymour <jon.seymour@gmail.com>
Date
Sep 4, 2010, 23:54 UTC
Message-ID
<AANLkTikdi2-eM5VMq4cgoTGTB4i0i=i7=3Co10FxYy7k@mail.gmail.com>
In-Reply-To
<AANLkTikT6R4-HMLNebwwsF0pxP_uBTdi=+QkAL2m1EL=@mail.gmail.com>
Show 8 quoted lines
> The idea is that each developer maintains a base branch, all
> dependencies are merged into that base branch
> and all their work is performed ontop of that base. As the work is
> stabilised, it is rebased onto topic branches based
> on well known tags and these topics are then published. The basic
> ideas is always merge into the _base_ of the working branch
> , never merge into the _tip_  and never publish the tip of the working branch.
>

A key point I missed here that is worth emphasising - as work is rebased from the tip of the working branch onto stable topics that are then published, the topics are then re-merged into the _base_ of the working branch as well. This is very important - it keeps the working tree stable, while keeping the topic branches clean.

> jon.
>
Previous: Jon Seymour
Message 3 of 3 in “Workflow question: Topic -> Next w/ frequent API changes”
  1. Bryan DrewerySep 4, 2010
  2. Jon SeymourSep 4, 2010
  3. Jon SeymourSep 4, 2010

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.