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

(no subject)

From
JHJoshua Hudson <joshudson@gmail.com>
Date
Apr 21, 2020, 20:05 UTC
Message-ID
<CA+jjjYTJdAVMXjGWKFuigviePfdP1bLLmme_NMTuK9ZEi1HP-g@mail.gmail.com>

We've been getting really annoying merge conflicts that aren't logically merge conflicts but git can't resolve them of itself.

$ git merge origin/master merge conflicts src/data/record.type2.dat src/data/record.type3.dat src/data/localization.strings.dat $

where it would be quite reasonable to make a merge tool that merged localization.strings.dat only if it could also edit record.*.dat as well. However, if it picked up the result of an automatic merge of record.*.dat it just won't work as it no longer has enough information to do the merge.

The approach is specific to the structure of these dat files, and would not be generally applicable.

Message 1 of 1 in “”
  1. Joshua HudsonApr 21, 2020

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.