-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 01/31/2014 05:49 PM, Joachim Fritzsch wrote: > I had the same problem. After two hours of frustration I gave up > and re-cloned the repo. > > Joachim > yep.
I putted "* -crlf" into .gitattributes, deleted that particular file entirely and then "git pull" worked. But it is annoying to deal with those superfluous ^M mess. > On Fri, Jan 31, 2014 at 4:01 PM, Toralf Förster > <[email protected]> wrote: 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. > >> _______________________________________________ boinc_dev mailing >> list [email protected] >> http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To >> unsubscribe, visit the above URL and (near bottom of page) enter >> your email address. > - -- 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/ iF4EAREIAAYFAlLr5tsACgkQxOrN3gB26U7d1wD/f368PM5MfjW5Hm/Yse+3/nBZ RjGbpHYFn/0+sReWjlUA/0xFcjZYHOAeHETkIqCYpgCU6QoPhElt5bnxEPEzHGRr =sJU2 -----END PGP SIGNATURE----- _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
