Re: git-rerere observations and feature suggestions
- From
Theodore Tso <tytso@mit.edu>
- Date
- Jun 16, 2008, 11:27 UTC
- Message-ID
- <20080616112709.GG12260@mit.edu>
- In-Reply-To
- <20080616110113.GA22945@elte.hu>
On Mon, Jun 16, 2008 at 01:01:13PM +0200, Ingo Molnar wrote:
Show 6 quoted lines
> ( 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