One great #RubyOnRails tip that I recently received

Before you start figuring out how to merge the changes generated by `rails app:update` - preview them and sort your config first. Commit that. Then in the next commit the diff is going to be nice and clean.