24 December Rails and Merb merge!
Posted by
Willem van Bergen in Ruby on Rails
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. 
4 Comments - Tags: awesomeness, bloat, community, conflicts, git, merb, merge, rails
Tim Knip's profile