title: How to 'fix' a SVN branch/tree conflict?
body: <p>I took over a software project and decided to put everything under SVN (on <a href="http://www.assembla.com/" rel="noreferrer">Assembla</a>) using Tortoise SVN. The trunk is under ROOT. So the trunk contained the whole application (which I tagged 1.0). For my first big feature I created a feature branch named "dev". </p>
  
  <p>I could merge changes in the trunk branch into the dev branch without problem (as I was doing small bug fixes). Once my feature was complete, I did a merge back into the trunk branch. Everything was working fin up to this point. The new code under ROOT showed the new feature properly. But then I did a commit (of the result of the merge) and now every time I try to do a merge from the root or from the dev branch, SVN complains about "tree conflict" on many files. Even files that I did not touch since the merge. I tried to resolve the conflicts, without success.</p>
  
  <p>I'm the only developer, so I don't really care about major changes to the repository. But I still want to keep the history of all files if it's possible.</p>
  
  <p>What would be the best way to fix this issue? Is there a way I could tag all the latest files in the ROOT trunk as the "definite" version of the file?</p>
  
  <hr>
  
  <p>[EDIT] More information</p>
  
  <ol>
  <li>Yes, 'main' and 'trunk' is the same thing. I have clarified my question</li>
  <li>When you merged back from the feature branch, did you first do another merge from the trunk to aborb the latest trunk changes?" Yes. The trunk was up-to-date. And the dev branch had all the changes from the trunk.</li>
  <li>"everything got screwed up on committing": What I meant was that the commit was fine, but then as soon as I started doing merge from the trunk/to the trunk, SVN complains about 'Tree conflicts'.</li>
  <li>I have over 200 tree conflicts. So what I'm looking for is a "accept all" command</li>
  </ol>
  
  <hr>
  
  <p>[EDIT] elhoim solution did not fix my problem. However, he was right with SVN version issues. Currently (2009-10-28), Assembla is using SVN v1.5.1 and my tortoiseSVN was v1.6. So that was the reason I was having so much tree conflict. I tried using the solution as provided by elhoim's link and it did not work (I tried a bunch of merge multiple times before trying the HEAD-to-HEAD merge. Some files didn't carry over to the root branch because of that).</p>
  
  <p>Seeing that an HEAD-to-HEAD merge would still not work, I decided to simply delete all ".svn" files in my branch folder, copy the files into the ROOT folder and do a commit. </p>