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
Michael J Gruber <git@drmicha.warpmail.net>
Date
Jun 17, 2010, 11:58 UTC
Message-ID
<4C1A0DCD.2070906@drmicha.warpmail.net>
In-Reply-To
<AANLkTinWS0zWhh0d-yrb7eWMEeQenoAF8tA6-l9BRP_q@mail.gmail.com>
Daniel Blendea venit, vidit, dixit 17.06.2010 13:18:
Show 6 quoted lines
> Windows 7, did not change anything related to crlf.
> 
> I solved the problem with
> 
> git fetch --all
> git reset --hard origin/master

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

Michael
Previous: Daniel BlendeaNext: Matthieu Moy
Message 7 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.