Error updating my GrovePi

[mikethechap]

Hi followed the instructions here.

cd /home/pi/Desktop/GrovePi
sudo git fetch origin
sudo git reset --hard
sudo git merge origin/master

But, I keep getting this error:
> Updating 6d5defb…2a290f1

 error: Your local changes to the following files would be overwritten by merge:
 Software/Python/grove_electromagnet.py
 Please, commit your changes or stash them before you can merge.
 Aborting

Any notion what might be going on?

Thanks!

Mike D.

[graykevinb]

I am not a got expert, so not sure. However take a look at the got docs. https://git-scm.com

[Shoban]

Hi @mikethechap,

It looks like you might have modified the file grove_electromagnet.py . If so, copy this file to a new location and restore to its default in the …/Software/Python/ location. Also if you are using Raspbian for Robots image, we have a DI_Update Icon on the Desktop, this allows you to update the software and firmware by double clicking on it and choosing GrovePi.

-Shoban

[mikethechap]

Thanks, Graykevinb and Shoban. I’ll try to replace the file as suggested.