title: VisualSVN Merge Conflict assistance
body: <p>I am trying to merge a feature branch back to the trunk and I am getting </p>
  
  <blockquote>
    <p>One or more files are in a conflicted state.</p>
    
    <p>Conflicted </p>
    
    <ul>
    <li>C:\Projects\MyaPP\frmMain.vb<br>
    C:\Projects\MyaPP\frmMain.Designer.vb Conflicted<br>
    C:\Projects\MyaPP\Controls\frmView.Designer.vb</li>
    </ul>
  </blockquote>
  
  <p>Here is a brief history on what happened.</p>
  
  <p>From the trunk, a feature branch (Feature1) was created, in May 2011.
  From the trunk, a feature branch (Feature2) was created, in July 2011.</p>
  
  <p>then last Friday, branches/Feature2 was merged back into the trunk successfully. Then today I attempted to merge branches/Feature1 I am getting the error above.</p>
  
  <p>any advice on how I should handle this?</p>