title: Git merge does not add new files
body: <p>Here's my commit history:</p>
  
  <pre><code> * Merge commit (missing file a.c)
  /|
  ||
  *| Add new file a.c again &lt;- branchB
  ||
  |* Remove files a.c &lt;- branchA
  ||
  *| Remove files a.c
  ||
  \|
   |
   * Add new file a.c
   |
   |
  ...
  </code></pre>
  
  <p>I have a branchA branch where I added a file. Then, I branched to branchB. For some reason (refactoring), the file was later deleted in branchB. I backported those changes into branchA. But again later, I added the file in branchB. Finally I merged branchB into branchA.</p>
  
  <pre><code>git checkout branchA
  git merge branchB
  </code></pre>
  
  <p>During the merge, there's no mention of file a.c. And the file does not exist after the merge in branchA. Why is git not able to see that in branchB the file a.c was added AFTER (with respect to date and time) the deletion (in both branches) and thus it need to keep it? At least, I would like to see a conflict or something...</p>
  
  <p>Thank you for your help !</p>