Good luck to the merged Rails team and hopefully Rails 3 will kick ass! Let’s hope git will really deliver on this gig! Try to refrain from using git blame too much when resolving merge conflicts. 
Tags: awesomeness, bloat, community, conflicts, git, merb, merge, rails
Tim Knip's profile
December 24th, 2008 at 12:08 pm
That’s a cool, individual ‘picture’ of the merger.
Great !
December 26th, 2008 at 6:26 pm
Is’t the same joke as new logo?
http://is.gd/dz7u
December 27th, 2008 at 4:18 pm
@goffry I think not, this one is much more geekier :p
December 27th, 2008 at 4:25 pm
I even had an idea with a merge conflict on
community.rb, but even my geekiness has its limits