I am trying to upgrade from 4.2.13 to 4.3.0, and it complains about production.rb

Question

I've just tried to upgrade from v4.2.13 to 4.3, and at the git checkout stage, it complains with:

error: Your local changes to the following files would be overwritten by checkout:
	config/environments/production.rb
	yarn.lock
Please commit your changes or stash them before you switch branches.

I have no idea how to use "git stash" to get out of the problem.
I used git stash to store it, ran checkout again which succeeded, but when I tried to stash pop it, it complained the file needed merging.

I have no idea what to do next, and the release notes don't explain that this step could be needed.

Chewie · Accepted Answer

I managed to fix it.
I moved yarn.lock to a different directory (not needed to use it since, so will delete it later.
config/environments/production.rb contained some extra config I was told to add to make my site usable over tor, and someone told me to remove them as they shouldn't be in there, and should be added as ADDITIONAL_DOMAIN line in .env.production instead.

In the end, I upgraded from 4.2.24 to 4.3.0 successfully.

I am trying to upgrade from 4.2.13 to 4.3.0, and it complains about production.rb

1 Answers