title: How to merge working copy into Base revision in subversion
body: <p><strong>EDIT my issue had nothing to do with SVN itself (see my answer below)</strong></p>
  
  <p>I'm using Tortoise SVN.  I have a file that several developers are working on, including me.</p>
  
  <p>I updated before I started working on the file, but another developer made changes to the file and committed.  I updated my local (which, if I understand right, makes my local Working Base copy of the file match the Head revision in the repo).  When I do a diff, TortoiseMerge shows me the changes made by the other developer in the Working Base copy, and my changes in the Working Copy.</p>
  
  <p>What I want to do is have my changes and the other dev's changes merged.  I understand that if we edited the same line I may get a conflict and am happy to merge manually at that point.  But I would like to be able to have svn do the automatic merging of both sets of changes without either set getting clobbered.</p>
  
  <p>Last time this happened I just committed, expecting it to merge on the way in, but my changes clobbered the other dev's.  Suggestions?  Settings?  Lack of understanding svn on my part (entirely possible)?</p>