[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Show all options for conflict resolution

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: Thu, 13 Mar 2008 19:42:25 -0500

On Thu, Mar 13, 2008 at 7:39 PM, Blair Zajac <blair_at_orcaware.com> wrote:
>
> Ben Collins-Sussman wrote:
> > We originally showed all options, and it seemed simply overwhelming.
> > So we took a clue from perforce (which has a really similar UI) and
> > decided to show only the most common options for newbies.
> > Intermediate users will look at the whole list to see more options,
> > and advanced users just end up habituating to typing the letters they
> > want without reading the prompt at all.
> >
> > I'd rather find a way to make the full list's availability more
> > obvious, rather than flooding the novice with 10 options.
>
> OK. But showing h)elp to show more options seems poorly named. Does Perforce
> do that to?

Yep:

Diff chunks: 4 yours + 2 theirs + 1 both + 1 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e:

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-14 01:42:36 CET

This is an archived mail posted to the Subversion Dev mailing list.