Content
Manual upgrade from 7.0.2 to 7.2.0
To update using the official manual:
https://www.openproject.org/operations/upgrading/upgrade-guide-manual-installation/
Stage one:
[openprojectdebian]# cd /home/openproject/openproject
[openproject@debian]# git fetch && git checkout stable/7@
As a result, I get the error:
~/openproject-ce$ git fetch && git checkout stable/7 M Gemfile M frontend/npm-shrinkwrap.json Already on 'stable/7' Your branch is behind 'origin/stable/7' by 32639 commits, and can be fast-forwarded. (use "git pull" to update your local branch)
Well, do the following:
~/openproject-ce$ git pull Updating 7de7cda046..ef02b087c8 error: Your local changes to the following files would be overwritten by merge: Gemfile frontend/npm-shrinkwrap.json Please commit your changes or stash them before you merge. Aborting
Well, do the following:
~/openproject-ce$ git commit On branch stable/7 Your branch is behind 'origin/stable/7' by 32639 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: modified: Gemfile modified: frontend/npm-shrinkwrap.json Untracked files: package-lock.json v4.2.2 vendor/ no changes added to commit
Please tell me how to do the update manually?
You have made local modification to your Gemfile and frontend/npm-shrinkwrap.json, which is why git pull is rejecting to apply changes.
If you’re certain you do not need these modifications, use
git fetch git reset --hard origin/stable/7
If you want to keep these modifications (Please note that modifying your Gemfile will likely cause merge conflicts you’ll have to resolve), commit your changes, then git pull origin stable/7.
Best,
Oliver
Why aren’t you using the installation packages?
Oliver Günther wrote:
You have made local modification to your
Gemfileandfrontend/npm-shrinkwrap.json, which is whygit pullis rejecting to apply changes.If you’re certain you do not need these modifications, use
[…]
If you want to keep these modifications (Please note that modifying your Gemfile will likely cause merge conflicts you’ll have to resolve), commit your changes, then
git pull origin stable/7.Best,
Oliver
Thank you so much! It’s all good! I’m happy! :-)
Niels Lindenthal wrote:
Why aren’t you using the installation packages?
Historically the situation. Had problems with installation of version 6 in Debian, so I had to install it manually.