Page 1 of 1

update from git

Posted: Mon Oct 10, 2016 8:19 pm
by coacharnold
I think this has already been answered somewhere, I just can't find it ......

I'm getting this error when I go to update with git

Updating b2c9d23..45a439f
error: Your local changes to the following files would be overwritten by merge:
src/MainApp.h
Please, commit your changes or stash them before you can merge.
Aborting


??????

update from git

Posted: Mon Oct 10, 2016 11:47 pm
by anonbeat
rm src/MainApp.h
git pull