We’ve recently upgraded to v1.7.0.beta9 +30. Shortly thereafter, we updated our email settings in app.yml. When trying to rebuild, via sudo ./launcher rebuild app, we get the following error:
Ensuring launcher is up to date
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
failed to update
The Template referenced here, web.ssl.templates.yml, was modified during our initial installation.
Please advise what we need to do to resolve this issue.