I tried running "git pull" and got this response:
Code:
$ git pull remote: Counting objects: 16, done. remote: Compressing objects: 100% (10/10), done. remote: Total 16 (delta 6), reused 13 (delta 3), pack-reused 0 Unpacking objects: 100% (16/16), done. From https://github.com/mamedev/buildtools_x64 4e55b99..6eba791 master -> origin/master Updating 4e55b99..6eba791 error: Your local changes to the following files would be overwritten by merge: win32/env.bat Please, commit your changes or stash them before you can merge. Aborting
I have made no changes to "win32/env.bat." I can't commit them. I don't know how to "stash" them. What is the syntax to override this environment protection, and make "git pull" override local changes? Is it --rebase?
|