Re: Problem with tree conflicts caused by a merge

On Thu, Aug 5, 2010 at 14:15, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Thanks for the test repo.
> This is actually a known issue. The svn lib provides an API which should
> allow to resolve a tree conflict like this, but it wasn't fully
> implemented for all kinds of tree conflicts. Seems this "tried to add,
> but was already added locally" is part of that missing implementation.
>
> I'll remove that button for that specific tree conflict.

I see. Thanks for explaining the situation.

I this case, I was able to resolve the conflicts (there were lots of
them in my real-world problem case) by manually copying files between
working copies and looking at diffs, but it ended up being pretty time
consuming to make sure that I didn't lose anything.

Is there a better way to deal with these type of conflicts in such a
way that we can be more confident that we're not losing stuff?

Thanks again,
-D

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2643374

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-05 20:50:38 CEST