I found this: http://stackoverflow.com/questions/17223527/how-do-i-force-git-to-checkout-the-master-branch-and-remove-carriage-returns-aft
That might help in the future. ----- Rom -----Original Message----- From: Toralf Förster [mailto:toralf.foers...@gmx.de] Sent: Friday, September 12, 2014 3:04 PM To: Rom Walton; git@vger.kernel.org Cc: boinc_...@ssl.berkeley.edu Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream On 09/12/2014 08:55 PM, Rom Walton wrote: > Crud... > > Well, personally, I would delete the locale directory and the two translation > files in html. > > Do the 'git pull', and then switch between master and some other branch. > > like: > git checkout -f client_release/7/7.4 > git checkout -f master > > It is round about, but it should get the job done. Re-cloning seems to be the only way, b/c : tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f client_release/7/7.4 Branch client_release/7/7.4 set up to track remote branch client_release/7/7.4 from origin. Switched to a new branch 'client_release/7/7.4' tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Checking out files: 100% (234/234), done. Switched to branch 'master' Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use "git pull" to update your local branch) tfoerste@n22 ~/devel/boinc-v2 $ git pull Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: ... <same picture as before> -- Toralf pgp key: 0076 E94E
