On Mon, Jun 16, 2008 at 01:01:13PM +0200, Ingo Molnar wrote: > ( Also, it's a GPL nitpicky issue: the conflict resolution database > can be argued to be part of "source code" and as such it should be > shared with everyone who asks. With trivial merges the data is > probably not copyrightable hence probably falls outside the scope > of the GPL, but with a complex topic tree like -tip with dozens of > conflict resolutions, the boundary is perhaps more blurred. ) For a more complex merge resolution, granted that it rises to the level of being "copyrightable", but I think it would be a huge stretch to call the rr-cache the "preferred form for modifications"! :-) - Ted -- 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
