Re: Merge-friendly text-based data storage

Richard Hartmann [off-list ref] writes:

On Mon, Mar 26, 2012 at 20:17, Junio C Hamano [off-list ref] wrote:

quoted

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.