title: Merging tag into trunk with Subversion
body: <p>I have this folder structure:</p>
  
  <p>\myproject\branches\v1.2</p>
  
  <p>\myproject\trunk</p>
  
  <p>I need to merge v1.2 back into trunk. v1.2 has revisions 104 and 105.  Trunk goes from 57-65 and 106.  The 106 revision is deleting a folder that doesn't exist in the v1.2 folder.</p>
  
  <p>My setup is file based.  I've tried this in trunk:</p>
  
  <p>MacBook:trunk myuser$ svn merge -r104:105 "file:///Developer/Main%20Repository/myproject/branches/v1.2"</p>
  
  <p>I had three conflicts and resolved them.  However, I do not see that any files have been updated in the trunk.  Do I need to do something else/different to complete the merge down?</p>
  
  <p>-- EDIT --</p>
  
  <p>I really want to merge the entire tag\v1.2 branch into trunk.  So I ran:</p>
  
  <pre><code>svn merge "file:///Developer/Main%20Repository/myproject/branches/v1.2"
  </code></pre>
  
  <p>and resolved a few more conflicts.  Is there a way for me to determine if the two branches are now the same?  I can see by doing some file comparisons that there are still definitely differences between the two branches, meaning the merge didn't work.</p>