Re: The coolest merge EVER!

[Jon Seymour <jon.seymour@gmail.com>]

On 6/23/05, Linus Torvalds <torvalds@osdl.org> wrote:
> 
> Ok, Junio had some cool octopus merges, but I just one-upped him.
> 
> I just merged the "gitk" repository into git, and I did it as a real git
> merge, which means that I actually retained all the original gitk
> repository information intact. IOW, it's not a "import the data" thing,
> it's literally a merge of the two trees, and the result has two roots.
> 
> Now, the advantage of this kind of merge is that Paul's original gitk
> repository is totally unaffected by it, yet because I now have his history
> (and the exact same objects), the normal kind of git merge should work
> fine for me to continue to import Paul's work - we have the common parent
> needed to resolve all differences.
> 

You do realise what this means, don't you?

The Borg can now start accumulating software into one massive
repository of everything ever written and it will never forget -
resistance will be futile.

Of course, it may run out of disk space.

jon.