Richard Hartmann <richih.mailinglist@xxxxxxxxx> writes: > On Tue, Mar 27, 2012 at 11:12, Holger Hellmuth <hellmuth@xxxxxxxxxx> wrote: > >> I may be misunderstanding something, but lets assume you want to merge a >> file that has "version: 0" with one that has "version: 1" and their last >> common ancestor would have "version: 0" naturally. So the merge would not >> fail even though the file layout changes. > > Ugh, I did not consider that. I can't come up with a way, other than a > custom merge driver, to prevent this. Am I correct? You are the only judge to that statement: "I can't come up with...". I can't either, but I know a custom ll-merge driver would work. It is designed for this kind of thing. It will know both version 0 and version 1 format, read from each and writes out the merged result in whatever format it wants to use. >> the only way >> would be to store each data line in its own file. As you store file paths >> that would even fit, but I doubt it is what you had in mind > > I considered this as well, but that's extremely expensive and wasteful. And it does not solve anything. The "version" file may cleanly merge to a new version, and there is no way for the merge result of "version" file to affect the outcome of merges in other files. -- 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