title: Merging trunk into a branch that has local changes
body: <p>I have a branch in SVN that I want to update with new changes from the trunk. I also have some files with local changes in this branch. I do not want to commit some of these changes just yet.</p>
  
  <p>If I try to merge the changes from trunk into this branch, it gives me an error:</p>
  
  <pre><code>Error: Cannot merge into a working copy that has local modifications
  </code></pre>
  
  <p>Is there a way to merge the trunk into the branch remotely on the server, so I can just update the branch normally afterwards?</p>