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

Re: Merge-friendly text-based data storage

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 26, 2012, 19:51 UTC
Message-ID
<7vobrjnnt4.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAD77+gQVDtoK0vJnSgX-+i9EeJo6QErUGuzd25_cfBmUfPvW4g@mail.gmail.com>
Richard Hartmann <richih.mailinglist@gmail.com> writes:
Show 8 quoted lines
> On Mon, Mar 26, 2012 at 20:17, Junio C Hamano <gitster@pobox.com> wrote:
>
>> It may be of interest to run "git help attributes" and read up on
>> "Defining a custom merge driver" section.
>
> Sounds good, thanks.
>
> My file layout looks fine?

I have no opinion on it. It is for the consumers of your datafile (the ones that read it and find these databasy items in it, and your custom merge driver) to decide.

Previous: Richard HartmannNext: Holger Hellmuth
Message 4 of 8 in “Merge-friendly text-based data storage”
  1. Richard HartmannMar 26, 2012
  2. Junio C HamanoMar 26, 2012
  3. Richard HartmannMar 26, 2012
  4. Junio C HamanoMar 26, 2012
  5. Holger HellmuthMar 27, 2012
  6. Richard HartmannMar 27, 2012
  7. Junio C HamanoMar 27, 2012
  8. Holger HellmuthMar 27, 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.