Comments on: Merge Made by Octopus http://epmills.com/2008/05/16/merge-made-by-octopus/ Evan P. Mills' Ramblings Wed, 07 Jan 2009 12:16:14 +0000 http://wordpress.org/?v=2.6.2 By: Evan http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-120 Evan Thu, 22 May 2008 23:53:23 +0000 http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-120 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. 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 http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-119 Evan Sat, 17 May 2008 18:14:41 +0000 http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-119 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. 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: Jonathan Rockway http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-118 Jonathan Rockway Sat, 17 May 2008 16:20:15 +0000 http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-118 Very cool image. I will have to get off my ass and actually make the T-shirt now. :) Very cool image. I will have to get off my ass and actually make the T-shirt now. :)

]]> By: Evan http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-117 Evan Sat, 17 May 2008 13:06:31 +0000 http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-117 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. 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: Jakub Narebski http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-116 Jakub Narebski Sat, 17 May 2008 07:40:28 +0000 http://epmills.com/2008/05/16/merge-made-by-octopus/#comment-116 A bit of explanation: <i>Merge made by octopus</i> 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. 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.

]]>