Upgrade fails - local changes package.json

hermann-san

Hi,
I've tried to upgrade from v2024.9.1 to v2024.12.0 and there is an error message when I execute
git checkout 2024.12.0

error: Your local changes to the following files would be overwritten by checkout:
package-lock.json
package.json
Please commit your changes or stash them before you switch branches.
Aborting

I'm how to proceed in this case. I'm not aware that I've changed the package.json manually.
How someone an Idea what to try in this case?

Thanks.

AlexQ

Hi @hermann-san , I don't know the solution, just some thoughts/ideas to try:

check if the 2 files really don't have any local changes by comparing them to the GitHub repo, in your case v204.9.1.:
- https://github.com/cryptpad/cryptpad/blob/2024.9.1/package.json
- https://github.com/cryptpad/cryptpad/blob/2024.9.1/package-lock.json
- I would do a automatic compare by diff or the like if it was changed by adding a space or so by accident, also look up up the file modified dates
after that maybe be try the update by loosing the "changes" by using git checkout -f 2024.12.0 (-f for "force")

I think if someone with more knowledge tries to help you those checks/infos would be helpful to them, too.

David

Hi @hermann-san
Local changes to package-lock.json should be discarded to allow you to pull the update. In my experience depending on your version of Node the lock file can be modified when you run npm install

To avoid this in future use npm ci instead of npm i this should leave your lock file untouched.