«
»

Rails and Merb merge!

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. ;-)

git checkout rails && git merge merb

Tags: , , , , , , ,

This entry was posted on Wednesday, December 24th, 2008 at 4:39 am and is filed under Ruby on Rails. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.

4 Responses to “Rails and Merb merge!”

  1. Joachim Says:
    December 24th, 2008 at 12:08 pm

    That’s a cool, individual ‘picture’ of the merger.
    Great !

  2. goffry Says:
    December 26th, 2008 at 6:26 pm

    Is’t the same joke as new logo?
    http://is.gd/dz7u

  3. jaap Says:
    December 27th, 2008 at 4:18 pm

    @goffry I think not, this one is much more geekier :p

  4. Willem van Bergen Says:
    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 ;)

Leave a Reply