update from git
Posted: Mon Oct 10, 2016 8:19 pm
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
??????
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
??????