Hi, when you design a file format to store structured data, and you want to manage these files with git, how do you do this best? I'd like to hear about best practices, experiences, links to discussions on this subject, ... Here are some of my questions: Do you store everything in a single file and configure git to use special diff- and merge-tools? Do you use XML for this purpose? Do you take care that the contents of your file is as stable as possible when it's saved or do you let your diff tools cope with issues like reordering, reassignment of identifiers (for example when identifiers are offsets in the file), ...? Do you store one object/record per file (with filename=id, for example with GUID-s) and hope that git will not mess them up when it merges them? Do you store records as directories, with very small files which contain single attributes (because records can be considered sets of key-value-pairs and the same applies to directories)? Do you configure git to do a scalar merge on non-text "attributes" (with special file extensions)? When you don't store everything in a single, binary file: Do you use git hooks to update an index for efficient queries on your structured data? Do you update the whole index for every change? Or do you use git hashes to decide which segment of your index needs to be updated? greetings, Sebastian -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html