title: Tools that automate merging of text files?
body: <p>I have trouble where, for some reason, SVN would only merge the newly generated template code to implemented code (thus overwriting whatever I had done), but not the other way around.</p>
  
  <p>For example,</p>
  
  <p>1) I generate a file called SomeFile.java. I commit this to trunk. I also branch this to feat1/SomeFile.java</p>
  
  <p>2) I work off of the feat1/SomeFile.java (the branch). Once everything is okay, I simply commit to feat1 branch, and reintegrate to the trunk.</p>
  
  <p>3) Now I need to re-generate the code again (with some changes). What I did before was I committed this to the trunk, then I tried to merge from feat1 branch to trunk. <strong>BUT</strong> for some reason SVN would not merge the files at all.</p>
  
  <p>Am I doing something wrong?</p>