Greetings! Just received my GrovePi (RPi 3) and got it up and working no problem on wifi. Using VNC to connect and run through the update procedure and I get to “sudo git merge origin/master” from the Desktop/GrovePi directory. I keep getting “your local changes to the following file would be overwritten by merge: Software/Python/grove_electromagnet.py”. Please commit your changes or stash them before you can merge. Aborting.
Naturally, I have not yet made any changes to the file. I decided, hmm, I’ll just delete it. Yeah, no joy. Even though ls no longer shows the file, I continue to get the SAME error!
I’d rather not go on and run the firmware update till I know the merge completed successfully.
Any hints? (BTW - some Rpi knowledge - I’ve built/use/own six or so. Some linux knowledge, but only brave because I know I can just rebuild. No Dex knowledge - yet!)
Thanks so much…