update from git

General discussions
Post Reply
coacharnold
Posts: 65
Joined: Tue Oct 04, 2011 10:54 am

update from git

Post by coacharnold » 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


??????

User avatar
anonbeat
Posts: 1946
Joined: Thu Sep 16, 2010 9:47 pm

update from git

Post by anonbeat » Mon Oct 10, 2016 11:47 pm

rm src/MainApp.h
git pull

Post Reply