title: merge deletes and adds wrong files
body: <p>Before you begin spewing git commands, I use Windows 7-64bit with TortoiseGit (currently v1.7.11.3) exclusively as I am new to Git. </p>
  
  <p>My DEV branch is older than current remote master and I update DEV, and resolve conflicts.<br>
  DEV branch has pushed commits to remote DEV branch, thus <code>rebase</code> is not possible - as I understand it.</p>
  
  <p>Why does this behaviour happen and how can I avoid it ?</p>
  
  <ol>
  <li><code>Checkout master</code> (switch to local master)</li>
  <li><code>Pull origin master</code> (No conflicts)</li>
  <li><code>Checkout DEV</code> (switch to dev branch)</li>
  <li><code>Merge master</code> (apply local master changes into local DEV branch)</li>
  <li>Fix conflicts and <code>commit</code> modified files (both auto-merged and fixed conflict files)</li>
  </ol>
  
  <p>When I open the <code>log</code> then I see "parent 1" files as in the commit window AND "parent 2" files, which werent shown. Here is the odd part, files that the (local/remote is same) master had <em>deleted</em> are now <strong>added</strong> and new files are <strong>deleted</strong>.<br>
  Additionally, "parent 2" files did not produce any conflicts despite some <strong>should</strong>!</p>
  
  <p>The new/deleted files work the opposite of what I expected. Why is that ?<br>
  If a file is new in master and I merge into DEV branch, then I expect it to exist after the merge.<br>
  My guess is that DEV branch is considered primary, and not the branch (master) I merge into DEV.</p>
  
  <p>I do not have the option to use <code>Revert</code> to re-create deleted files (those that are actually new in master).</p>