[solved] Trying to update -> failes

Added by Bernd Müller about 11 years ago

Hi!

I tried to update OP to the latest version but when I do a git pull I get following:

openproject@server:~/openproject$ git pull
Updating 10c476b..12c3bfd
error: Your local changes to the following files would be overwritten by merge:
    Gemfile.lock
Please, commit your changes or stash them before you can merge.
Aborting

What should I do?

Cheers.

Replies (2)

RE: Trying to update -> failes - Added by Christian Ratz about 11 years ago

Hello Bernd,

this happens when you have plugins installed. I posted the solution in this thread

Best
Ratzi

RE: Trying to update -> failes - Added by Bernd Müller about 11 years ago

Thanks!

After executing these commands:

git checkout Gemfile.lock
git pull
bundle install 
RAILS_ENV=production bundle exec rake db:migrate
RAILS_ENV=production bundle exec rake assets:precompile

OP got updated.

Cheers

Side Menu

Content

[solved] Trying to update -> failes

Replies (2)

RE: Trying to update -> failes - Added by Christian Ratz about 11 years ago

RE: Trying to update -> failes - Added by Bernd Müller about 11 years ago