title: Merge branches without losing files
body: <p>I created a feature branch from the <code>master</code> branch, than (did some work and) had to delete many files on this branch. Now, I would like to merge the changes back into <code>master</code>, but not lose the files on <code>master</code> that I removed on the feature branch. </p>
  
  <p>Here is, in short, what I did:</p>
  
  <pre><code>(master)&gt; git checkout -b feature
  # deleted many files
  &gt; git checkout master
  &gt; git merge ??? # how to merge back without losing files
  </code></pre>
  
  <p>In other words, when the file exists on the feature branch, than merge it into master. When the file is removed on the feature branch, don't merge the delete operation on master, but keep the file.</p>
  
  <p>How can I do this?</p>