From: "Toralf Förster" <toralf.foerster@gmx.de>
To: Rom Walton <romw@romwnet.org>, git@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
Date: Fri, 12 Sep 2014 20:32:26 +0200 [thread overview]
Message-ID: <54133C3A.4080700@gmx.de> (raw)
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
next prev parent reply other threads:[~2014-09-12 18:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 18:09 (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream Toralf Förster
2014-09-12 18:19 ` [boinc_dev] " Rom Walton
2014-09-12 18:32 ` Toralf Förster [this message]
2014-09-12 18:55 ` Rom Walton
2014-09-12 19:04 ` [boinc_dev] " Toralf Förster
2014-09-12 19:10 ` Rom Walton
[not found] ` <1BAFA9B4D550C347962F76F2E03B3BBB22C5FB-xy+Cp4waYzmnovBw3M9VzQFcV7zePqp5@public.gmane.org>
2014-09-13 14:55 ` Toralf Förster
2014-09-14 8:51 ` [boinc_dev] " Torsten Bögershausen
[not found] ` <54155708.7090508-S0/GAf8tV78@public.gmane.org>
2014-09-14 9:04 ` Toralf Förster
2014-09-14 11:23 ` [boinc_dev] " Torsten Bögershausen
2014-09-15 21:51 ` Rom Walton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54133C3A.4080700@gmx.de \
--to=toralf.foerster@gmx.de \
--cc=boinc_dev@ssl.berkeley.edu \
--cc=git@vger.kernel.org \
--cc=romw@romwnet.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.