subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swdev <>
Subject Re: new svn conflict resolver status update
Date Tue, 14 Jun 2016 07:29:19 GMT
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.

View raw message