Also in my experience a rebase yields more, but easier to solve conflicts. It only gets hairy if you do silly stuff like reordering commits in an interactive rebase.

You shouldn't have to edit schema.rb by hand btw. rather add a migration and run it or edit one you added and migrate a fresh database.