Yeah I’m currently re-applying my changes to the server.en.yml with every upgrade. It’s not the best, but it’ll do.
The biggest issue is that the upgrade process git-resets hard (no stashing) so if I ever forget to save my edited file before or after upgrading, I’m set back a ways.