From: Toralf Förster <toralf.foerster@gmx.de>
Date: Fri, 12 Sep 2014 19:04:28 GMT
Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
Message-ID: <541343BC.1050503@gmx.de>
In-Reply-To: <1BAFA9B4D550C347962F76F2E03B3BBB22C5FA@romw-mail.romwnet.org>

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