title: Using git, why don't commits appear in the history after merging into a feature branch?
body: <p>I have 2 branches, the main branch and a feature branch. Both branches had ongoing changes. I merged changes from the main branch into the feature branch. There were a few conflicts, which I resolved. I then staged the updated files.</p>
  
  <p>In the merge, there were a number of other commits that <strong>didn't</strong> have any conflicting files.</p>
  
  <p>With that, there are 2 things I don't understand.</p>
  
  <ol>
  <li>For the commits that didn't have any conflicts, shouldn't they show up in the history of the feature branch? Following the merge, there is nothing in the feature branch history for any of the work that was done on the main branch.</li>
  <li>Pertaining again to the commits that didn't have any conflicts, why do those files show up as being changed when running git status on the feature branch?</li>
  </ol>
  
  <p>Admittedly, there is probably something fundamentally missing in my understanding of what should happen...</p>