RE: How to resolve tree conficts with incoming move and local change

James,

I ended up doing something remarkably similar using PowerShell. Perhaps if the interactive merge prompted one to resolve the previous tree conflict upon detection of a duplicate (or if the merge - update? - in general actually coalesced a sequence on tree conflicts into their logical result?), then we wouldn't need to do things like this?

I understand the rationale behind not allowing duplicate tree conflicts, but perhaps some of the more common cases (e.g. several revisions applied to a moved directory in a branch) could be treated as a single logical tree conflict?

Thanks,

-- 
Thomas S. Trias
Senior Developer
Artizan Internet Services
http://www.artizan.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2374485
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].