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

Re: Workflow for templates?

From
HIHolger Hellmuth (IKS) <hellmuth@ira.uka.de>
Date
Nov 7, 2012, 16:03 UTC
Message-ID
<509A863B.4090805@ira.uka.de>
In-Reply-To
<20121106210719.GG28437@raven.wolf.lan>
Am 06.11.2012 22:07, schrieb Josef Wolf:
Show 5 quoted lines
> On Tue, Nov 06, 2012 at 08:21:25PM +0000, Pyeron, Jason J CTR (US) wrote:
>> Maybe I lost sight of your problem. Can you give a specific example of where "it" does not work?
>
> I guess it's _me_ who's lost. I can't figure how this is supposed to
> work. Maybe you have an example?

Let me ask a different question: What is wrong with cherry-picking downstream changes to your upstream branch? Without rebasing it to downstream.

That might mean there is a rather useless merge downstream later on, but that's the price you pay for not doing the change in a development branch.

Previous: Josef WolfNext: Enrico Weigelt
Message 7 of 12 in “Workflow for templates?”
  1. Josef WolfOct 25, 2012
  2. Enrico WeigeltOct 27, 2012
  3. Josef WolfOct 31, 2012
  4. Josef WolfNov 6, 2012
  5. Pyeron, Jason J CTR (US)Nov 6, 2012
  6. Josef WolfNov 6, 2012
  7. Holger Hellmuth (IKS)Nov 7, 2012
  8. Enrico WeigeltNov 10, 2012
  9. Enrico WeigeltNov 10, 2012
  10. Philip OakleyNov 10, 2012
  11. Enrico WeigeltNov 10, 2012
  12. Philip OakleyNov 10, 2012

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.