Re: Unexpected tree conflict after merge

On Tue, Nov 10, 2009 at 10:56:13AM +0100, Stefan Sperling wrote:
> > FYI - I'm using TortoiseSVN to do these operations. When I select "Edit
> > Tree Conflicts" in TortoiseSVN it says "The last merge operation tried to
> > delete/move/rename the file 'file.txt', but it was deleted, moved or renamed
> > locally."
>
> This message would be more correct if it said "... locally or in the
> history of the merge target (i.e. branch2)."

In step 5) the merge target is branch1 of course, not branch2. Sorry.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2416079

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-10 11:05:10 CET