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

Re: git merge-tree: bug report and some feature requests

From
Josh Bleecher Snyder <josharian@gmail.com>
Date
Jan 24, 2018, 18:46 UTC
Message-ID
<CAFAcib_MysZPZOJ5xTWrh8nLk1Tn3Vi4LbscxgBO-+02S9Wvkw@mail.gmail.com>
In-Reply-To
<CA+WKDT3ZsObXc2ENV3gUXbMZU=McBJdiEpvk7y2OM0t+PrqZtQ@mail.gmail.com>
Thanks, Ed. I think I'll pursue the libgit2 route; sounds promising.
Show 7 quoted lines
>> But the alternative appears to be punting entirely, as libgit2 does,
>> and merely providing something akin to three index entries.
>
> Indeed, when I added merge to libgit2, we put the higher-level conflict
> analysis into application code because there was not much interest in it
> at the time.  I've been meaning to add this to `git_status` in libgit2,
> but it's not been a high priority.

Is your conflict analysis application code public? I might be game to do some of the legwork to get it into libgit2's git_status (although I'm probably not the right person to do the API design). At a minimum, it would be helpful as a reference, as I'm probably about to recreate some subset of it myself.

-josh
Previous: Edward ThomsonNext: Elijah Newren
Message 6 of 7 in “git merge-tree: bug report and some feature requests”
  1. Josh Bleecher SnyderJan 21, 2018
  2. Ævar Arnfjörð BjarmasonJan 21, 2018
  3. Elijah NewrenJan 22, 2018
  4. Josh Bleecher SnyderJan 23, 2018
  5. Edward ThomsonJan 23, 2018
  6. Josh Bleecher SnyderJan 24, 2018
  7. Elijah NewrenJan 24, 2018

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.