From: Jeff Garzik <jgarzik@pobox.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Git Mailing List <git@vger.kernel.org>, Junio C Hamano <junkio@cox.net>
Subject: Re: Handling merge conflicts a bit more gracefully..
Date: Wed, 08 Jun 2005 23:07:54 -0400 [thread overview]
Message-ID: <42A7B28A.9010508@pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0506081336080.2286@ppc970.osdl.org>
Linus Torvalds wrote:
> Comments? It would be good to have people test this and maybe even write a
> few automated tests that it all works as expected..
I've got a few libata branches I have been putting off updating to the
latest kernel, because of merge conflicts ('chs-support' and 'passthru'
branches of libata-dev.git).
If this merge-gracefully stuff is all checked into git.git, I can
definitely give it some real-world testing.
Jeff
next prev parent reply other threads:[~2005-06-09 3:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-08 20:55 Handling merge conflicts a bit more gracefully Linus Torvalds
2005-06-08 23:07 ` Junio C Hamano
2005-06-08 23:35 ` Linus Torvalds
2005-06-09 0:03 ` Junio C Hamano
2005-06-09 0:41 ` Linus Torvalds
2005-06-09 1:04 ` Junio C Hamano
2005-06-09 0:11 ` Junio C Hamano
2005-06-09 1:08 ` Linus Torvalds
2005-06-09 2:15 ` Junio C Hamano
2005-06-09 2:48 ` Linus Torvalds
2005-06-09 4:35 ` Junio C Hamano
2005-06-09 4:54 ` Linus Torvalds
2005-06-09 5:15 ` Junio C Hamano
2005-06-09 7:02 ` [PATCH 0/3] " Junio C Hamano
2005-06-09 7:04 ` [PATCH 1/3] read-tree.c: rename local variables used in 3-way merge code Junio C Hamano
2005-06-09 7:05 ` [PATCH 2/3] read-tree -m 3-way: loosen index requirements that is too strict Junio C Hamano
2005-06-09 7:06 ` [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally Junio C Hamano
2005-06-09 15:15 ` Linus Torvalds
2005-06-09 17:26 ` Junio C Hamano
2005-06-09 17:37 ` Linus Torvalds
[not found] ` <7vbr6fnzf0.fsf@assigned-by-dhcp.cox.net>
[not found] ` <Pine.LNX.4.58.0506091152530.2286@ppc970.osdl.org>
2005-06-09 22:45 ` [PATCH] read-tree.c: rename local variables used in 3-way merge code Junio C Hamano
2005-06-09 22:47 ` [PATCH] Handle entry removals during merge correctly Junio C Hamano
2005-06-09 22:48 ` [PATCH] read-tree -m 3-way: loosen an index requirement that was too strict Junio C Hamano
2005-06-09 22:49 ` [PATCH] read-tree -m 3-way: handle more trivial merges internally Junio C Hamano
2005-06-09 20:35 ` [PATCH 3/3] " Junio C Hamano
2005-06-09 22:13 ` [PATCH] Add git-diff-stages command Junio C Hamano
2005-06-09 22:30 ` Linus Torvalds
2005-06-11 1:44 ` [PATCH] diff-stages: unuglify the too big main() function Junio C Hamano
2005-06-10 19:59 ` [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally Junio C Hamano
2005-06-18 0:15 ` Handling merge conflicts a bit more gracefully Herbert Xu
2005-06-18 0:26 ` Linus Torvalds
2005-06-09 3:07 ` Jeff Garzik [this message]
2005-06-09 4:11 ` Linus Torvalds
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=42A7B28A.9010508@pobox.com \
--to=jgarzik@pobox.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.