rails-credentials-conflict 0.2.0
Resolve git merge conflicts in Rails encrypted credentials by decrypting, merging, and re-encrypting them. Works with merge, rebase, and cherry-pick.
Gemfile:
=
install:
=
Runtime Dependencies (2):
activesupport
>= 6.0
railties
>= 6.0