title: SVN - automate merge of trunk into branch
body: <p>I have a branch in SVN that I want to keep up to date with changes from the trunk. What I would like to do is have a script or something that runs nightly that does this merge and then commits the new version of the branch if there are no merge conflicts but if there are merge conflicts somehow indicate so. I found this <a href="http://devlicio.us/blogs/derik_whittaker/archive/2010/05/13/automating-merges-w-tortoisesvn.aspx">post</a> that is somewhat helpful although it doesn't do everything. </p>
  
  <p>I have been unable to find a way to determine whether there are merge conflicts and this is mostly what I'm looking for. Adding building the code and then committing on success will be easy enough in the script but without having a way to check for merge conflicts this won't be successful.</p>
  
  <p>Thanks for any help you guys can provide!</p>