From: Linus Torvalds <torvalds@osdl.org>
To: Mark E Mason <mark.e.mason@broadcom.com>
Cc: git@vger.kernel.org
Subject: Re: Fatal error from git bisect
Date: Thu, 9 Feb 2006 11:50:49 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602091148080.2458@g5.osdl.org> (raw)
In-Reply-To: <7E000E7F06B05C49BDBB769ADAF44D0773A48E@NT-SJCA-0750.brcm.ad.broadcom.com>
On Thu, 9 Feb 2006, Mark E Mason wrote:
>
> I'm trying to use 'git bisect' and am running into the following error:
>
> fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot merge.
This seems to mean that you have a dirty block/elevator.c file. Have you
perhaps edited it?
Linus
next prev parent reply other threads:[~2006-02-09 19:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-09 18:51 Fatal error from git bisect Mark E Mason
2006-02-09 19:50 ` Linus Torvalds [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-02-09 19:59 Mark E Mason
2006-02-09 20:16 ` Linus Torvalds
2006-02-09 21:21 Mark E Mason
2006-02-09 21:32 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* 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.0602091148080.2458@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=mark.e.mason@broadcom.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).