Hi followed the instructions here.
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?