From: Jeff King <peff@peff.net>
To: Holger Hellmuth <hellmuth@ira.uka.de>
Cc: Junio C Hamano <gitster@pobox.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
kusmabite@gmail.com, Git Mailing List <git@vger.kernel.org>
Subject: Re: git add -p and unresolved conflicts
Date: Thu, 29 Mar 2012 02:08:53 -0400 [thread overview]
Message-ID: <20120329060853.GD27604@sigill.intra.peff.net> (raw)
In-Reply-To: <4F736C17.4000403@ira.uka.de>
On Wed, Mar 28, 2012 at 09:52:55PM +0200, Holger Hellmuth wrote:
> On 28.03.2012 21:19, Junio C Hamano wrote:
> >Holger Hellmuth<hellmuth@ira.uka.de> writes:
> >
> >>I don't think it's that tricky:
>
> I was assuming this "tricky" was about a sensible user interface.
I think maybe the discussion elsewhere in this thread has given you a
taste of the trickiness, but if you want to read more, here is a similar
discussion from the same time last year (ahh, Spring, when a young man's
thoughts turn to partial staging of conflicted hunks):
http://thread.gmane.org/gmane.comp.version-control.git/168403/focus=168842
-Peff
next prev parent reply other threads:[~2012-03-29 6:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 9:51 git add -p and unresolved conflicts Erik Faye-Lund
2012-03-28 15:10 ` Junio C Hamano
2012-03-28 15:21 ` Matthieu Moy
2012-03-28 19:14 ` Holger Hellmuth
2012-03-28 19:19 ` Junio C Hamano
2012-03-28 19:52 ` Holger Hellmuth
2012-03-29 6:08 ` Jeff King [this message]
2012-03-29 10:19 ` Holger Hellmuth
2012-03-28 19:38 ` Matthieu Moy
2012-03-28 19:54 ` Junio C Hamano
2012-03-28 20:10 ` Holger Hellmuth
2012-03-28 20:50 ` Junio C Hamano
2012-03-28 22:50 ` Holger Hellmuth
2012-03-28 23:01 ` Junio C Hamano
2012-03-28 23:05 ` Junio C Hamano
2012-03-29 1:32 ` Holger Hellmuth
2012-03-29 7:26 ` Matthieu Moy
2012-03-29 21:08 ` Junio C Hamano
2012-03-30 8:11 ` Matthieu Moy
2012-03-28 15:33 ` Erik Faye-Lund
2012-03-28 17:17 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120329060853.GD27604@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hellmuth@ira.uka.de \
--cc=kusmabite@gmail.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.
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 NNTP newsgroup(s).