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

Re: [PATCH v2] Make cherry-pick use rerere for conflict resolution.

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Aug 11, 2008, 11:49 UTC
Message-ID
<48A0274D.8090504@viscovery.net>
In-Reply-To
<alpine.DEB.1.00.0808111328590.24820@pacific.mpi-cbg.de.mpi-cbg.de>
Johannes Schindelin schrieb:
> That would actually be a problem, no?  I am not sure that resolutions for 
> reverts make sense for cherry-picks, so I am not sure if resolutions 
> should be recorded for reverts.

Of course they should. If the reversal is part of a topic branch that you rebase at least once, then you want to have the resolutions recorded, don't you?

-- Hannes
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 7 of 12 in “Make cherry-pick use rerere for conflict resolution.”
  1. Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen, Aug 10, 2008
  2. Johannes SchindelinAug 10, 2008
  3. Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen, Aug 11, 2008
  4. Johannes SchindelinAug 11, 2008
  5. Petr BaudisAug 11, 2008
  6. Johannes SchindelinAug 11, 2008
  7. Johannes SixtAug 11, 2008
  8. Johannes SchindelinAug 11, 2008
  9. Johannes SixtAug 12, 2008
  10. Junio C HamanoAug 11, 2008
  11. Abhijit Menon-SenAug 12, 2008
  12. Junio C HamanoAug 12, 2008

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.