Floorplanner Tech Blog » merge http://techblog.floorplanner.com Just another WordPress weblog Thu, 19 Nov 2009 04:00:57 +0000 http://wordpress.org/?v=2.8.6 en hourly 1 Rails and Merb merge! http://techblog.floorplanner.com/2008/12/24/rails-and-merb-merge/ http://techblog.floorplanner.com/2008/12/24/rails-and-merb-merge/#comments Wed, 24 Dec 2008 02:39:15 +0000 Willem van Bergen http://techblog.floorplanner.com/?p=398

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

]]> http://techblog.floorplanner.com/2008/12/24/rails-and-merb-merge/feed/ 4