-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Ick, today I run again into a problem with the git tree of the BOINC project: http://boinc.berkeley.edu/git/boinc-v2.git A git pull won't work any longer due to: $ git pull Updating 089459d..01f0ead error: Your local changes to the following files would be overwritten by merge: lib/boinc_win.h Please, commit your changes or stash them before you can merge. Aborting A "git diff" gave : diff --git a/lib/boinc_win.h b/lib/boinc_win.h index 0676372..4c62ed5 100644 - --- a/lib/boinc_win.h +++ b/lib/boinc_win.h @@ -137,7 +137,7 @@ typedef size_t socklen_t; #include <stdint.h> #include <imagehlp.h> #else - -#include <security.h> +#include <security.h> #include <dbghelp.h> #endif #include <tlhelp32.h> which pointed me to a ^M in line 137 of that file. I removed that ^M, but a pull still wonät work. Then I removed the file and checked it out again - no chance, git pull always fails with the same massage. Finally I tried : $ git stash warning: CRLF will be replaced by LF in lib/boinc_win.h. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in lib/boinc_win.h. The file will have its original line endings in your working directory. Saved working directory and index state WIP on master: 089459d locale: Update compiled localization files HEAD is now at 089459d locale: Update compiled localization files but again I run into : $ git pull Updating 089459d..01f0ead error: Your local changes to the following files would be overwritten by merge: lib/boinc_win.h Please, commit your changes or stash them before you can merge. Aborting /me wonders how to solve this w/o cloning the complete repo again. - -- MfG/Sincerely Toralf Förster pgp finger print:1A37 6F99 4A9D 026F 13E2 4DCF C4EA CDDE 0076 E94E -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iF4EAREIAAYFAlLrutIACgkQxOrN3gB26U5ZHwD/eGEr4hR+F5TVP7m0/JO6Km+j VN6ak30WMPK8Fe9pWHYBAIWD4EDIspHUkNfq76Vakc6uNaLVne8MFiikniH7WjhL =xwGS -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html