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. ----- Rom -----Original Message----- From: Toralf Förster [mailto:toralf.foers...@gmx.de] Sent: Friday, September 12, 2014 2:32 PM To: Rom Walton; g...@vger.kernel.org Cc: boinc_dev@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: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 _______________________________________________ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
