From: Andreas Schwab <schwab@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Jens Axboe <jaxboe@fusionio.com>,
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, 01 Jun 2011 22:57:45 +0200 [thread overview]
Message-ID: <m2oc2htgl2.fsf@igel.home> (raw)
In-Reply-To: <BANLkTimgjdFQcSfOOFFjmSC+Wt_xPXr4Xg@mail.gmail.com> (Linus Torvalds's message of "Thu, 2 Jun 2011 05:27:45 +0900")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Git has wonderful support for helping resolve merges intelligently,
> but you need to know how to do it. See the gitk example above - run it
> and ponder.
Btw, when I redo the merge and let kdiff3 resolve the conflicts (via git
mergetool) it does exactly the right thing. :-)
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-06-01 20:57 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
2011-06-01 20:57 ` Andreas Schwab [this message]
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=m2oc2htgl2.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=gitster@pobox.com \
--cc=jaxboe@fusionio.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