From: Christoph Hellwig <hch@infradead.org>
To: Mark Haverkamp <markh@osdl.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>,
linux-scsi <linux-scsi@vger.kernel.org>
Subject: Re: Latest update to scsi-misc-2.6
Date: Mon, 31 Oct 2005 17:38:09 +0000 [thread overview]
Message-ID: <20051031173809.GA9743@infradead.org> (raw)
In-Reply-To: <1130780179.24530.21.camel@markh1.pdx.osdl.net>
On Mon, Oct 31, 2005 at 09:36:19AM -0800, Mark Haverkamp wrote:
> > My best guess is that your merge programme is confused. I've had to
> > merge the tree up several times to fix conflicts, but it's the same
> > tree. It looks like whatever tool you used to merge failed to recognise
> > this.
>
> OK, Thanks, Maybe I need to update my git tools.
I recently had odd merge problems aswell. I decided to kill the tree
and recheckout but I got even more odd problems. Upgrading to the latest
git release helped.
Wishing we'd have a mature SCM once again..
prev parent reply other threads:[~2005-10-31 17:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-31 17:13 Latest update to scsi-misc-2.6 Mark Haverkamp
2005-10-31 17:32 ` James Bottomley
2005-10-31 17:36 ` Mark Haverkamp
2005-10-31 17:38 ` Christoph Hellwig [this message]
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=20051031173809.GA9743@infradead.org \
--to=hch@infradead.org \
--cc=James.Bottomley@steeleye.com \
--cc=linux-scsi@vger.kernel.org \
--cc=markh@osdl.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