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

Re: git pull (Your local changes to ... would be overwritten by merge)

From
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Date
Jun 18, 2010, 07:44 UTC
Message-ID
<BFBC3418-44C5-484D-8508-60813675409D@gmail.com>
In-Reply-To
<vpqbpb9ofby.fsf@bauges.imag.fr>
On 17. juni 2010, at 17.21, Matthieu Moy wrote:
Show 16 quoted lines
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>> I guess this shows that correct diagnostics is not a prerequisite for a
>> successful therapy ;)
>> 
>> (The diagnostics really indicate a work tree with local uncommitted
>> modifications.)
> 
> I'd bet for this kind of issue:
> 
> http://kerneltrap.org/mailarchive/git/2010/3/9/25215/thread
> From: Johannes Schindelin
> Subject: core.autocrlf considered half-assed
> 
> Didn't follow the outcome in details, but some patches were proposed
> to improve the situation.
Finn Arne Gangstad's "safe autocrlf" patch (c480539, currently in next) solves the problem by disabling conversion for files that contain CRs in the repository.
-- 
Eyvind Bernhardsen
Previous: Matthieu Moy
Message 9 of 9 in “git pull (Your local changes to ... would be overwritten by merge)”
  1. Daniel BlendeaJun 17, 2010
  2. Santi BéjarJun 17, 2010
  3. Daniel BlendeaJun 17, 2010
  4. Michael J GruberJun 17, 2010
  5. Matthieu MoyJun 17, 2010
  6. Daniel BlendeaJun 17, 2010
  7. Michael J GruberJun 17, 2010
  8. Matthieu MoyJun 17, 2010
  9. Eyvind BernhardsenJun 18, 2010

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.