title: Git merge loses a few files
body: <p>I have two git branch. One is &quot;master&quot; who has a lot of materials. The other one is called &quot;simple&quot;. When I did originally cloned &quot;Simple&quot; from &quot;Master&quot;, I removed a lot of files from Simple, so &quot;Simple&quot; is a stripped down version of &quot;master&quot;. A couple weeks later, some amount of work has been done on &quot;simple&quot; and when i switch to the &quot;master&quot; branch and try</p>
  <pre><code>git merge simple
  </code></pre>
  <p>I notice that some of my codes, but not all of them (that were not in the &quot;simple&quot; branch) is currently missing. I have to do a reset to a pre-merged commitment to find all the files</p>
  <p>Let me know what to do</p>