Git Issue
Posted: Wed May 02, 2018 12:18 pm
Hi Evilhero,
I tried to add the latest 5 updates.
I did what I always do:
1) kill instance of python running in windows
2) use cmd and navigate to c:\Mylar
3) git pull
This time it gave an error:
"please, commit your changes or stash them before you can merge."
I backed up all files in Mylar before proceeding:
1) After googling I reset the head or something like that, but I don't think it did anything.
2) restored my files
3) I ran cmd with elevated privileges and it read the above error.
I'm not sure what to do to get it to merge the files.
Windows 7 machine
Thanks
I tried to add the latest 5 updates.
I did what I always do:
1) kill instance of python running in windows
2) use cmd and navigate to c:\Mylar
3) git pull
This time it gave an error:
"please, commit your changes or stash them before you can merge."
I backed up all files in Mylar before proceeding:
1) After googling I reset the head or something like that, but I don't think it did anything.
2) restored my files
3) I ran cmd with elevated privileges and it read the above error.
I'm not sure what to do to get it to merge the files.
Windows 7 machine
Thanks