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
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jun 17, 2010, 15:21 UTC
Message-ID
<vpqbpb9ofby.fsf@bauges.imag.fr>
In-Reply-To
<4C1A0DCD.2070906@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
> Daniel Blendea venit, vidit, dixit 17.06.2010 13:18:
>> Windows 7, did not change anything related to crlf.

I never used Git on Windows, but I think Git sets autocrlf to true by default on Windows.

Show 5 quoted lines
> 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.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Michael J GruberNext: Eyvind Bernhardsen
Message 8 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.