16th May, 2008

Merge Made by Octopus

I’ve been coming up to speed on Git and swallowing up every tutorial and blog entry I can find.

A few days ago, I ran into Jonathan Rockway’s very entertaining blog entry Git Merging by Example.  Great read and very instructive.  But I was particularly amused by Jonathan’s quote:

I love the “Merge made by octopus” message; I am seriously going to have a t-shirt made that says that. I like it when sea creatures help maintain my code.

You know what?  I love when sea creatures help out as well.  So, to that end I’ve constructed a little bumper sticker in honor of Git and Jonathan.  Here’s a preview:

Merge Made by Octopus

If you’re interested in getting a hold of one of the bumper stickers, leave a comment.
Sorry it’s not a t-shirt, Jonathan, but maybe someday…

Posted by: Evan

Categories:

Responses

A bit of explanation: Merge made by octopus means that current merge (joining two or more lines of development) was made using non-default merge strategy called ‘octopus’ (the merge itself is called by git users ‘octopus merge’).

It is called ‘octopus’ because while typical, ordinary merge has two parents (two legs), octopus merge has more than two parents (more than two legs). I think the limit is 16 legs… err, parents.

By: Jakub Narebski on May 17th, 2008
at 3:40 am

Thanks, Jakub, for that clear explanation. Sometimes I find Git terminology to be a little confusing so I appreciate any help I can get.

If you have any more great nuggets o’ Git wisdom, lay ‘em on me.

By: Evan on May 17th, 2008
at 9:06 am

Very cool image. I will have to get off my ass and actually make the T-shirt now. :)

By: Jonathan Rockway on May 17th, 2008
at 12:20 pm

Sweet! I’m doing the sticker through makestickers.com outta Chicago. They did a great job with an order I placed a few months back so I’m hoping these are gonna turn out just as well.

They have some sister sites for doing pins and t-shirts I believe so I may check into that after the stickers arrive.

If either you or Jakub are interested in getting one, I’d be happy to send one yer way.

By: Evan on May 17th, 2008
at 2:14 pm

Stickers came today! They look awesome — very true to the orginal design. I modified the colors to be mostly 100% Panatone but even the drop shadows came out very nicely.

Kudos to makestickers.com for an excellent job.

By: Evan on May 22nd, 2008
at 7:53 pm

Leave a response






Your response:

Categories