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

On 09/12/2014 08:19 PM, Rom Walton wrote:
> Try:
> git checkout -f master
> git pull origin
> 
> I committed fixes for that stuff this morning.

doesn't helped :

tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master
Already on '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 origin
Updating ce97e85..d2e5582
error: Your local changes to the following files would be overwritten by merge:
        html/languages/translations/hu.po
        html/languages/translations/nl.po
        locale/bg/BOINC-Web.po
        locale/da/BOINC-Web.po
        locale/el/BOINC-Web.po
        locale/fr/BOINC-Web.po
        locale/hr/BOINC-Web.po
        locale/hu/BOINC-Project-Generic.po
        locale/hu/BOINC-Web.po
        locale/it_IT/BOINC-Project-Generic.po
        locale/lv/BOINC-Web.po
        locale/nl/BOINC-Project-Generic.po
        locale/nl/BOINC-Web.po
        locale/pl/BOINC-Web.po
        locale/pt_BR/BOINC-Web.po
        locale/ro/BOINC-Web.po
        locale/sk/BOINC-Web.po
        locale/zh_TW/BOINC-Web.po
Please, commit your changes or stash them before you can merge.
Aborting

-- 
Toralf
pgp key: 0076 E94E