From: Michael J Gruber <git@drmicha.warpmail.net>
To: Daniel Blendea <bdaniel7@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>, git@vger.kernel.org
Subject: Re: git pull (Your local changes to ... would be overwritten by merge)
Date: Thu, 17 Jun 2010 13:58:05 +0200 [thread overview]
Message-ID: <4C1A0DCD.2070906@drmicha.warpmail.net> (raw)
In-Reply-To: <AANLkTinWS0zWhh0d-yrb7eWMEeQenoAF8tA6-l9BRP_q@mail.gmail.com>
Daniel Blendea venit, vidit, dixit 17.06.2010 13:18:
> 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
next prev parent reply other threads:[~2010-06-17 11:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <AANLkTinokUxiDdetcrsrlSExQ7hmhLS5szbTt9KzGKr_@mail.gmail.com>
2010-06-17 9:35 ` git pull (Your local changes to ... would be overwritten by merge) Daniel Blendea
2010-06-17 9:46 ` Santi Béjar
2010-06-17 10:20 ` Daniel Blendea
2010-06-17 10:42 ` Michael J Gruber
2010-06-17 11:11 ` Matthieu Moy
2010-06-17 11:18 ` Daniel Blendea
2010-06-17 11:58 ` Michael J Gruber [this message]
2010-06-17 15:21 ` Matthieu Moy
2010-06-18 7:44 ` Eyvind Bernhardsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C1A0DCD.2070906@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=bdaniel7@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).