Tree conflict resolution options on command-line
From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Mon, 4 Aug 2014 14:05:33 +1000
Using: svn 1.8.8 (r1568071)
When attempting to merge a change into my working copy, I am getting a tree
Conflict discovered when trying to add 'foo\A\B\c.p'.
If I select to use either of 'mf' or 'tf', I get:
Summary of conflits:
My question is: If a tree conflict can only ever be resolved to 'working',
--- Daniel BecroftReceived on 2014-08-04 06:06:23 CEST
This is an archived mail posted to the Subversion Users mailing list.