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

Re: Edit a rerere conflict resolution

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 12, 2012, 21:52 UTC
Message-ID
<7v7gyppjuu.fsf@alter.siamese.dyndns.org>
In-Reply-To
<m34nttzeex.fsf@localhost.localdomain>
Jakub Narebski <jnareb@gmail.com> writes:
> You can also use custom merge strategies, but that is probably
> overkill, and I am not sure that it would work (adding new strategy)
> without modifying git.

Merge strategies are primarily for people who want to customize the way how the final shape of the resulting tree is determined. Even if you go that route, you would need to write and use your own merge driver anyway in order to tweak the way how the file-level three-way merge is performed.

So it is not just an overkill, but it is entirely pointless, as it buys nothing to use a custom merge strategy in this case.

Previous: Jakub NarebskiNext: Vincent van Ravesteijn
Message 9 of 16 in “Edit a rerere conflict resolution”
  1. Vincent van RavesteijnMar 12, 2012
  2. Junio C HamanoMar 12, 2012
  3. Vincent van RavesteijnMar 12, 2012
  4. Junio C HamanoMar 12, 2012
  5. Vincent van RavesteijnMar 12, 2012
  6. Junio C HamanoMar 12, 2012
  7. Vincent van RavesteijnMar 12, 2012
  8. Jakub NarebskiMar 12, 2012
  9. Junio C HamanoMar 12, 2012
  10. Vincent van RavesteijnMar 16, 2012
  11. Junio C HamanoMar 16, 2012
  12. Vincent van RavesteijnMar 16, 2012
  13. Junio C HamanoMar 16, 2012
  14. Vincent van RavesteijnMar 16, 2012
  15. Junio C HamanoMar 16, 2012
  16. Vincent van RavesteijnMar 17, 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.