title: Merging changes from a branch into the trunk
body: <p>I'm using SVN for version control, with a project in Eclipse.
  But, I'm using TortoiseSVN as a client, in Windows 10.</p>
  
  <p>So I commit and update, from Windows Explorer, no problem with that.</p>
  
  <p>So I started a test.</p>
  
  <p>I have a folder <code>/trunk</code> in the repository, and a folder <code>/branches/1.77</code> also in the repository.
  (which I created with Tortoise SVN->Branch/Tags) with no problem, I didn't switch.)</p>
  
  <p>First I point my working copy to the trunk folder, create a file <code>versionado.trunk.txt</code> and commit that change.</p>
  
  <p>Everything is OK at this point.</p>
  
  <p>I switch to <code>/braches/1.77</code>. In my working copy I see that SVN deleted <code>versionado.trunk.txt</code>.</p>
  
  <p>Then in my working copy I create another file <code>versionado.branch.txt</code>, and commit. All good, I have versioned <code>versionado.branch.txt</code>.</p>
  
  <p>In my working copy I don't have <code>versionado.trunk.txt</code>, because I working on the branch.</p>
  
  <p>When I switch to the trunk again, <code>versionado.branch.txt</code> is deleted from my working copy, because I'm working in the trunk, and SVN created <code>versionado.trunk.txt</code> again.</p>
  
  <p>My question is where do I have to "be" in the working copy to merge from the branch (x.xx) to the trunk?</p>
  
  <p>My strategy is to work (daily development) in trunk, and I have deployed versions in the branches, where eventually I have to fix some bugs, bugs that I should merge to the trunk!</p>
  
  <p>I try to merge from branches to the trunk (with my working copy pointing to trunk), but SVN tells me that there is a tree conflict, because <code>versionado.trunk.txt</code> not exist (it was deleted on the switch from branches to trunk).</p>
  
  <p>Any idea what I'm doing wrong?</p>