rails-credentials-conflict

https://github.com/jwo1f/rails-credentials-conflict

Resolve git merge conflicts in Rails encrypted credentials by decrypting, merging, and re-encrypting them. Works with merge, rebase, and cherry-pick.