From: Johannes Sixt <j.sixt@viscovery.net>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>, spearce@spearce.org
Subject: Re: [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts.
Date: Wed, 31 Mar 2010 15:51:10 +0200 [thread overview]
Message-ID: <4BB3534E.3080803@viscovery.net> (raw)
In-Reply-To: <t2u2cfc40321003310523u8fda9baeo883d2e0b3c6fa807@mail.gmail.com>
Am 3/31/2010 14:23, schrieb Jon Seymour:
> What about the safe (but complicated) diff -c by default (to prevent
> misinformed Use Remote/Local decisions, by default) and a "Conflicts
> Only" option (disabled by default) that shows the diff --cc output for
> those who know what they are doing?
You would like to have the worst of all three?
1. dangerous menu options
2. incomprehensible diff -c output
3. and a config option on top of it
I think we should have none of them.
Yes, I suggested diff -c, but after seeing how it works (better: not
works), I changed my mind.
What sort of user guidance is it to present alluring menu options "Use
local/remote version", but at the same time a scaring amount of diff -c
output.
-- Hannes
next prev parent reply other threads:[~2010-03-31 13:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-30 15:34 [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts Jon Seymour
2010-03-31 7:20 ` Johannes Sixt
2010-03-31 11:12 ` Jon Seymour
2010-03-31 11:39 ` Johannes Sixt
2010-03-31 11:50 ` Jon Seymour
2010-03-31 12:23 ` Jon Seymour
2010-03-31 13:51 ` Johannes Sixt [this message]
2010-03-31 19:52 ` Jon Seymour
2010-04-02 8:37 ` Johannes Sixt
2010-04-04 6:44 ` Jon Seymour
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=4BB3534E.3080803@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=jon.seymour@gmail.com \
--cc=spearce@spearce.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.