Automatically resolve Git merge conflicts in Rails schema.rb:

https://gist.github.com/jeromedalbert/afab24e80102b41d75d5f5538f1459c4

(I have also updated tpope's hooker gem to reflect Rails 5.x changes)