From: Linus Torvalds <torvalds@osdl.org>
To: Dave Jones <davej@redhat.com>
Cc: git@vger.kernel.org
Subject: Re: merging problems with Linus' kernel tree.
Date: Tue, 21 Feb 2006 10:55:15 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602211052360.30245@g5.osdl.org> (raw)
In-Reply-To: <20060221183306.GC22988@redhat.com>
On Tue, 21 Feb 2006, Dave Jones wrote:
>
> Documentation/cpu-hotplug.txt: needs update
> fatal: Entry 'Documentation/cpu-hotplug.txt' would be overwritten by merge. Cannot merge.
This means that it's dirty in the index, not that you've committed any
changes.
Do a "git diff".
(It may also be that the diff is empty, and only shows the filename. That
means that you've changed the mtime - for example edited it, and then
undone the edit - so that the file is dirty in the index, even if the
_contents_ are the same. If so, do a "git-update-index --refresh" or
similar, or just ask for "git status", which will do it for you as part of
checking the status of all your files).
Linus
next prev parent reply other threads:[~2006-02-21 18:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-21 18:33 merging problems with Linus' kernel tree Dave Jones
2006-02-21 18:55 ` Linus Torvalds [this message]
2006-02-21 19:19 ` Dave Jones
2006-02-21 20:03 ` Linus Torvalds
2006-02-21 20:29 ` Dave Jones
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=Pine.LNX.4.64.0602211052360.30245@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=davej@redhat.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).