rails-schema-resolve: Support `git merge` too.
Upgrade to gpg2, and set up gpg-agent.