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

Writing merge strategy?

From
IMIsrael, Daniel M <dmi1@lanl.gov>
Date
Jan 25, 2019, 00:55 UTC
Message-ID
<244FE6CE-C045-4EC9-8C3F-8D16CF4D09EB@lanl.gov>
I need a custom merge strategy (not driver) for a tool I’m writing, and I’m wondering:
1. Is there documentation for the API anywhere?
2. Does git-merge actually do any magic, or could I just run the script that implements my merge directly?  In other words, is there really any difference between a merge strategy and a script that creates the tree I want and then commits it using git-commit-tree with multiple -p arguments.
—
Daniel M. Israel, Ph. D.
Physics Verification Lead
XCP-4: Methods & Algorithms
Mailstop F644
Los Alamos National Laboratory
505 665 5664
Next: Junio C Hamano
Message 1 of 2 in “Writing merge strategy?”
  1. Israel, Daniel MJan 25, 2019
  2. Junio C HamanoJan 25, 2019

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.