title: Tree conflicts in SVN (subclipse)
body: <p>I have been working on a branch for a while, and deleted a directory (folder) that I do not need. Next, I tried to merge from the trunk to get any changes. In the process of this merge, the SVN complains about tree conflicts. As a result, when I tried to commit the changes to my branch, SVN did not allow me to do it. It seems that the directory I deleted from my local branch does not exist any more in my local workspace, but it still exists on the trunk. Does anybody know how to resolve this kind of tree conflicts? Thanks!</p>