So I am in the process of upgrading an old staging instance so that I can do some testing of changes before rolling out to production, and when I run
./launcher rebuild app it goes through the process of downloading latest image, etc. - and then it gives me these errors about doing
git pull as part of the rebuild process:
$ ./launcher rebuild app Ensuring launcher is up to date Fetching origin Updating Launcher Updating 488fd91..c11d5b0 error: Your local changes to the following files would be overwritten by merge: discourse-setup image/base/Dockerfile image/base/install-gifsicle image/base/install-imagemagick image/base/install-nginx image/base/install-pngcrush image/base/install-pngquant image/discourse_dev/postgres_dev.template.yml image/discourse_fast_switch/Dockerfile image/discourse_fast_switch/create_switch.rb image/discourse_test/Dockerfile launcher samples/standalone.yml samples/web_only.yml templates/postgres.10.template.yml templates/postgres.9.5.template.yml templates/postgres.template.yml templates/web.ssl.template.yml templates/web.template.yml Please, commit your changes or stash them before you can merge. Aborting failed to update
I have not changed these, and it looks like they’re all changes from the last time I did a rebuild. How should I proceed?
Edit: I admit I am not a great
git master - so if there’s some git command I can run to force it to update just let me know.