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.
