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

Re: A workflow for local patch maintenance

From
SBStephen Bash <bash@genarts.com>
Date
Oct 11, 2013, 13:22 UTC
Message-ID
<247350414.2015225.1381497748024.JavaMail.root@genarts.com>
In-Reply-To
<20131010173628.GB24782@sigill.intra.peff.net>
----- Original Message -----
Show 15 quoted lines
> From: "Jeff King" <peff@peff.net>
> Sent: Thursday, October 10, 2013 1:36:28 PM
> Subject: Re: A workflow for local patch maintenance
> 
> ... snip ...
>
> That being said, there are some new downsides, as you noted:
> 
>   1. Resolving conflicts between your version and the reworked
>   upstream version can be a pain.
> 
> ... snip ...
> 
> To mitigate problem 1, I will sometimes revert a local topic before
> doing the upstream merge, if I know it has been reworked.

Peff (slightly off topic) - A coworker of mine actually ran into this problem earlier this week. Is there recommended way to revert a merged topic branch? I assume it's essentially reverted each commit introduced by the branch, but is there a convenient invocation of revert? (easy to remember and hard to screw up)

Thanks, Stephen

Previous: Jonathan NiederNext: Jeff King
Message 6 of 8 in “A workflow for local patch maintenance”
  1. Tony FinchOct 8, 2013
  2. Jeff KingOct 10, 2013
  3. Tony FinchOct 10, 2013
  4. Jeff KingOct 10, 2013
  5. Jonathan NiederOct 10, 2013
  6. Stephen BashOct 11, 2013
  7. Jeff KingOct 11, 2013
  8. Stephen BashOct 11, 2013

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.