update from git
  • 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


    ??????
  • rm src/MainApp.h
    git pull

Howdy, Stranger!

It looks like you're new here. If you want to get involved, click one of these buttons!

Sign In with OpenID

In this Discussion