Problem while upgrade with git.

Submitted by fcattaneo on Mon, 04/04/2016 - 20:42

I'm trying to upgrade my emoncms installation with this command :

cd /var/www/emoncms

sudo git pull

but i get this error :

...

From https//githhub.com/emoncms/emoncms

ba42579..2ed9419 stable -> origin/stable

ba42579..7cdbaf1 master -> orign/master

* [new tag] 9.4 -> 9.4

Updating ba42579..2ed9419

error : your local changes to the following files would be

scripts/mqtt_input

scripts/phpmqtt_input.php

Please commit your changes or stash them before you can m

in fact I have changed this files ( i remember a little modification on scripts/phpmqtt_input.php )

in order to change the basetopic..

unfortunately I do not have the backup copy of the original files and i don't not familiar with "git".

What should I do to continue the upgrade with git?

Thanks in advance,

Fabrizio.

Re: Problem while upgrade with git.

Submitted by Paul Reed on Mon, 04/04/2016 - 21:39.

If you are happy to lose the modifications that you made;

git reset --hard

Then git pull to update.
You should not need to use 'sudo', if you do, then your file permissions may not be set up correctly.

Paul

Re: Problem while upgrade with git.

Submitted by Bill Thomson on Tue, 05/04/2016 - 03:39.

On the other hand, if you want to save your changes, issue the command:

git stash

reference: https://git-scm.com/docs/git-stash

Re: Problem while upgrade with git.

Submitted by fcattaneo on Tue, 05/04/2016 - 20:28.

Thanks.. i fixed the problem as your suggestion.

Unfortunately i have to use 'sudo' with 'git command'.. ; perhaps because I have done something wrong in the first installation and now the permission require root privileges.

Ciao,

Fabrizio

Archived Forum