RE: New tree conflicts for obstructions?
From: Bert Huijben <bert_at_qqmail.nl>
Date: Fri, 11 Nov 2011 19:36:07 +0100
Technically the delete is already scheduled when the tree conflict is added.
But I agree that we should improve the conflict resolution in this case.
The best way to resolve this conflict on 1.7.x would be reverting as that
From: Mark Phippard [mailto:markphip_at_gmail.com]
It looks like SVN 1.7 added some new tree conflicts. For example, when
$ svn status
We need to add support for this in Subclipse. From what we can see the only
What I normally do is use svn update --force which does not produce a tree
-- Thanks Mark Phippard http://markphip.blogspot.com/Received on 2011-11-11 19:36:44 CET
This is an archived mail posted to the Subversion Dev mailing list.