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

Michael J Gruber [off-list ref] writes:

Daniel Blendea venit, vidit, dixit 17.06.2010 13:18:

quoted

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.

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/

On 17. juni 2010, at 17.21, Matthieu Moy wrote:

Michael J Gruber [off-list ref] writes:

quoted

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