title: How to ignore/resolve svn tree conflicts when merging to branch with folders deleted on purpose?
body: <p>In one of my branches I deleted some folders on purpose which contain plug-in sources that shouldn't be available for most of the developers using this branch. When merging new revisions from trunk to branch, i am always getting tree conflicts which i just resolve. </p>
  
  <p>How can I tell svn (TortoiseSVN 1.7.6) to just ignore these deleted folders and tree conflicts in the future to speed up my merging process?</p>