Sam Vilain <sam@xxxxxxxxxx> writes: > David Kastrup wrote: >>> These files which store metadata would be stored in a way that is >>> "in another dimension" to the project files, despite being a part of >>> the history. That means that all tools built to deal with regular >>> files and directories will not be able to merge the changes to the >>> attributes without special support. I think this is broken. >>> >> >> That presumes that a good way to merge attributes is to use a text >> file merge algorithm, complete with finding diff context lines in a >> basically unchanged order. >> > > Yes. Is that not a reasonable assumption, in the absence of anything > more enlightened? Is that a trick question? My comment was exactly about not throwing away the information ("This is not arbitrary text but talks about the files in our tree.") that would make for more enlightened use. -- David Kastrup - 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