title: How do I make svn update prompt to resolve conflicts?
body: <p>I always use <em>svn update</em> from the command line in order to update my svn repo. However, we have a few files which always conflict, but which I generally always want to resolve immediately to mine. Until recently, whenever I ran <em>svn update</em> it would prompt me in-line for file resolutions. However, for some unknown reason it stopped recently, forcing me to resolve things in an extra separate step. </p>
  
  <p>How do I re-enable the behavior where it will prompt in-line from the command line?</p>