title: Subversion / SVN - how to apply merge diff file into codebase
body: <p>I have a diff file generated from <code>svn diff</code>. I know there is a <code>svn patch</code> command. But whenever it runs into a conflict, it saves the conflict into a separate .conflict file, making it very difficult to resolve. I don't see a &quot;--merge&quot; option in <code>svn patch</code>.</p>
  <p>Is there a way to apply patch like the way <code>svn merge</code> does?</p>