Anyone saving encrypted secrets in git will probably find it helpful to enable cleartext diffs: https://github.com/mozilla/sops#48showing-diffs-in-cleartext-in

Anyone saving encrypted secrets in git will probably find it helpful to enable cleartext diffs: https://github.com/mozilla/sops#48showing-diffs-in-cleartext-in-git https://github.com/mozilla/sops#48showing-diffs-in-cleartext... If you have many secrets you'll probably still end up breaking them out into different files to minimize conflicts between multiple in-progress branches. A good place to start is keeping a secrets file per environment+service: - sops-dev-mywebapp.yml - sops-dev-mydb.yml - sops-prod-mywebapp.yml - sops-prod-mydb.yml