title: SVN: Merge from branch to trunk where both contains new content
body: <p>This is my first time with subversion and I have a problem that I can't figure out. Coulnd't find the right answer neither.</p>
  
  <p>I copied remote trunk (master) into my computer and made changes on it. While I was working my copy someone else updated remote trunk with new features. Now I have codes that trunk has not, and trunk has codes my branch has not. When I try to pull latest updates from master trunk my local changes disappears and I cant merge my local changes into trunk because I don't have the latest updates from trunk. I use TortoiseSVN. Can someone help me on this issue?</p>