git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream

From
RWRom Walton <romw-egxtziwxyp1afugrpc6u6w@public.gmane.org>
Date
Sep 12, 2014, 19:10 UTC
Message-ID
<1BAFA9B4D550C347962F76F2E03B3BBB22C5FB@romw-mail.romwnet.org>
In-Reply-To
<541343BC.1050503@gmx.de>

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.foerster@gmx.de] 
Sent: Friday, September 12, 2014 3:04 PM
To: Rom Walton; 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
On 09/12/2014 08:55 PM, Rom Walton wrote:
Show 11 quoted lines
> 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

_______________________________________________ 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.

Previous: Toralf FörsterNext: Torsten Bögershausen
Message 6 of 11 in “(local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream”
  1. Toralf FörsterSep 12, 2014
  2. Rom WaltonSep 12, 2014
  3. Toralf FörsterSep 12, 2014
  4. Rom WaltonSep 12, 2014
  5. Toralf FörsterSep 12, 2014
  6. Rom WaltonSep 12, 2014
  7. Torsten BögershausenSep 14, 2014
  8. Toralf FörsterSep 13, 2014
  9. Toralf FörsterSep 14, 2014
  10. Torsten BögershausenSep 14, 2014
  11. Rom WaltonSep 15, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.