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

Re: Tree conflict resolution considered harmful

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 29 Aug 2018 17:25:37 +0200

On Wed, Aug 29, 2018 at 02:29:16PM +0200, Branko Čibej wrote:
> On 29.08.2018 12:54, Dag-Erling Smørgrav wrote:
> > Please add an option to disable conflict resolution entirely.
>
> Would not one of the --accept option values work? E.g.,
> `--accept=theirs-conflict', though that would also affect how the file
> contents are merged.
>
> -- Brane
>

Either --accept postpone or --non-interactive should prevent
the interactive resolver from running.

Then resolve tree conflicts manually as with SVN 1.9.
Received on 2018-08-29 17:25:56 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.