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

Re: new svn conflict resolver status update

From: swdev <swdev1_at_gmail.com>
Date: Tue, 14 Jun 2016 10:29:19 +0300

Here's a though of the top of my head

Say, in a given scenario, you have resolution options A, B, C and D
displayed as
  A) xxx B) xxx C) xxx D) xxx : suggest C:

Where suggest C means that the suggested resolution would be option C.

You could then have an '--use-suggested-resolution' option that would
automatically use the suggested resolution, if there is one. If there is no
suggested resolution, svn would still prompt the user.
Received on 2016-06-14 09:30:09 CEST

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