title: git merge without losing new files on merge-to branch
body: <p>I have two branches that have a common parent in the recent past.
  Lets call them feature-br-A and feature-br-B.</p>
  
  <p>Development work has continued in parallel on both branches.   feature-br-B has mostly bug fixes.   feature-br-A has some bug fixes and at least one new feature.</p>
  
  <p>Now as come the time to bring the bug fixes made in feature-br-B forward into feature-br-A.</p>
  
  <pre><code>git checkout feature-br-A
  git merge feature-br-B
  &lt;&lt; conflicts &gt;&gt;
  </code></pre>
  
  <p>The few file conflicts are simple and easy to resolve.  But there are a whole bunch of files that were added only to feature-br-A that are marked for deletion.  And there are a set of few more files only added to feature-br-A that are in conflict that marked 'deleted by them'.</p>
  
  <p>How can I merge the changes made on feature-br-B into feature-br-A without losing all the changes made already on feature-br-A?</p>
  
  <p>I tried</p>
  
  <pre><code>git merge -Xours --no-commit feature-br-B
  </code></pre>
  
  <p>but that created the same issue.</p>
  
  <p>My other concern is if this happening to added files, is this also happening to the other files that were changed to add features to feature-br-A?</p>
  
  <p>I suppose I can unstage the deletions from the merge, but it doesn't seem right that it should be deleting the new files at all.</p>