From: Jens Axboe <jaxboe@fusionio.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
LKML <linux-kernel@vger.kernel.org>, axboe <axboe@kernel.dk>,
Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] ide: Fix bug caused by git merge
Date: Wed, 1 Jun 2011 22:41:56 +0200 [thread overview]
Message-ID: <4DE6A414.802@fusionio.com> (raw)
In-Reply-To: <BANLkTimgjdFQcSfOOFFjmSC+Wt_xPXr4Xg@mail.gmail.com>
On 2011-06-01 22:27, Linus Torvalds wrote:
> Jens, you really can't do that. When you see a conflict marker, you
> need to look at WHY. The conflict may well be because of removed lines
> rather than added lines, the correct resolution is NOT necessarily to
> just take everything within the conflicting region.
Of course I look at the conflicts. I don't know what happened in this
case. Contrary to what you think, I do do regular merges. Usually not in
external branches, and if I do, it's only to resolve non-trivial
conflicts.
And I don't know why this one got so screwed up, well reversed really.
--
Jens Axboe
next prev parent reply other threads:[~2011-06-01 20:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 19:25 [PATCH] ide: Fix bug caused by git merge Steven Rostedt
2011-06-01 20:27 ` Linus Torvalds
2011-06-01 20:41 ` Jens Axboe [this message]
2011-06-01 20:57 ` Andreas Schwab
2011-06-01 21:55 ` Junio C Hamano
2011-06-01 22:01 ` Junio C Hamano
2011-06-02 0:01 ` Steven Rostedt
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=4DE6A414.802@fusionio.com \
--to=jaxboe@fusionio.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=gitster@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.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