app/Config is getting unwieldy to manage now

Just want to vent my frustration...
I am upgrading a couple of projects to latest CI4 and I must say that the mess in app/Config/* is getting worse with every release! Trying to merge my own config from a 4.0.x project to 4.1.9 is a real pain. All the deprecation code in the framework doesn't allow me to clean out the files either. This combined with the change of comments style in the Config-files isn't a help either, making diffs impossible.
I don't say I have a solution, but if anyone has a suggestion I'm all ears!
/Mattias

If you use Composer try:
https://github.com/tattersoftware/codeigniter4-patches
https://github.com/paulbalandan/liaison-revision

ci-phpunit-test | CodeIgniter Testing Guide | CodeIgniter 3 to 4 Upgrade Helper

If you use Composer try:
https://github.com/tattersoftware/codeigniter4-patches
https://github.com/paulbalandan/liaison-revision

Thanks! Will give that a try.