Re: Tree conflict cannot be resolved

On 28.10.2009 01:15, Robert Dailey wrote:
> I'm using TortoiseSVN 1.6.5.
>
> When I do a Merge from trunk to a feature branch of mine, one of the
> files shows up as a tree conflict. From the "Resolved..." dialog, I
> right-click that item and go to "Edit Conflicts". A dialog appears saying:
>
> *"The last merge operation tried to add the file 'Animation.cpp', but it
> was obstructed in the working copy.*
> *
> *
> *Conflicted Sources:*
> * Source Left: svn://domain.com/redsword_at_1825
> <http://domain.com/redsword@1825>*
> * Source Right: svn://domain.com/redsword_at_1935
> <http://domain.com/redsword@1935>*
> *
> *
> *How do you want to resolve this conflict?*
> * >> Keep the file from the repository <<*
> * >> Keep the local file <<"*
>
> I chose the "Keep the file from the repository" option. After clicking
> that, an error dialog appears stating:
>
> *"Tree conflicts can only be resolved to 'working' state;*
> *'E:\IT\work\project\Animation.cpp' not resolved"*
>
> Why is this happening?

http://tortoisesvn.tigris.org/ChangeLog.txt
- BUG: Resolving tree conflicts resulted in an error message. (Stefan)

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412196
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].