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

Re: developing a modified Linux-style workflow

From
David Aguilar <davvid@gmail.com>
Date
Dec 13, 2010, 03:31 UTC
Message-ID
<20101213033145.GA3609@gmail.com>
In-Reply-To
<7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C@at.or.at>
On Sun, Dec 12, 2010 at 05:24:16PM -0500, Hans-Christoph Steiner wrote:
Show 21 quoted lines
> 
> Hey all,
> 
> (and my second post on this list...)
> 
> I've gotten pretty good at git, and its helping me already with
> managing the very odd workflows I have with the software I work a
> lot on called Pd (http://puredata.info).  My role in Pd development
> is like a Linux lieutenant.
> 
> I also the main dev for an app called Pd-extended, which is based on
> Pd.  Now I'm stuck trying to figure out how to use git to match my
> current workflow for Pd-extended, which is a kind of long-lived
> branch, almost like a friendly fork.  So its kind of close to the
> Linux workflow with me as a lieutenant, but not quite.
> 
> What makes it tricky is that I make releases directly from my repo
> that are widely used.  So my repo is both lieutenant and dictator at
> the same time.  So that's where I am stumped.  I want to be able to
> rebase and push to a public repo, but that would be stupid.  So
> there has got to be another way.

Have you considered periodically merging Pd into Pd-extended as an alternative to rebasing? It might even be easier to manage in the long-term.

-- 
		David
Previous: Hans-Christoph SteinerNext: Hans-Christoph Steiner
Message 2 of 4 in “developing a modified Linux-style workflow”
  1. Hans-Christoph SteinerDec 12, 2010
  2. David AguilarDec 13, 2010
  3. Hans-Christoph SteinerDec 13, 2010
  4. Neal KreitzingerDec 13, 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.