search

dphuang2 / PoGoBag

Analyze and share your Pokémon through a locally run server! Official Site access has been stopped as of 12/23/2016
146 stars 49 forks source link

[QUESTION] not updating gemfile.lock #80

Open PassyFox opened 8 years ago

PassyFox commented 8 years ago

after updating it says it aborted. how to resolve this issue?

C:\PoGoBag>git pull remote: Counting objects: 68, done. remote: Compressing objects: 100% (67/67), done.Unpacking objects: 11% (8/68) emote: Total 68 (delta 25), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (68/68), done. From https://github.com/dphuang2/PoGoBag b47d0c9..899f9b2 master -> origin/master

  • [new branch] angularify -> origin/angularify Updating b47d0c9..899f9b2 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

C:\PoGoBag>

pandacubed commented 8 years ago

I have this exact problem too. Otherwise, the program still works fine.

dphuang2 commented 8 years ago

Try to re-clone the repo and let me know

pandacubed commented 8 years ago

@dphuang2 : I re-cloned it and still got the same error when I used the git pull command in the project directory.

PassyFox commented 8 years ago

same as panda's ^^

SonGokuSSJ commented 8 years ago

Just found this thread by accident. I also had that problem about 3 or 4 weeks ago and for me it helped to just delete the gemfile.lock file as I did not change anything in that file.