> I created a trunk and branch A from the trunk. Then, I created a file in
> the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's
> merge two branches option. The merge encountered a tree conflict on the
> file. Selecting edit tree conflict says:
> The last merge operation tried to delete/move/rename the file 'file'
> but the file was deleted, moved, or renamed locally.
> This message suggests that a merge operation tried to delete/move/rename a
> file, and does not suggest that the merge operation tried to add the file.
> What should I do to make the branch match the trunk, in this case? How
> can I prevent the tree conflict from showing up in the future for this file?
Received on 2011-12-08 00:25:22 CET
This is an archived mail posted to the Subversion Users