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

On Wed, Jul 22, 2009 at 09:29:31AM -0700, Thomas S. Trias wrote:
> 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?

http://subversion.tigris.org/tasks.html#tree-conflicts-ui

> 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?

What exactly do you mean? Can you give an example?

Stefan
Received on 2009-07-22 18:40:25 CEST