title: missing files after git merge
body: <p>Some weeks ago I create a feature branch, I'm developing in. There are severals commits and some new files as well. I can change from master branch to my development branch and versa vice and everything is fine.</p>
  
  <p>Today I tried to merge my branch back to the master branch. Therefore I changed to master and called </p>
  
  <pre><code>git merge mydevbranch
  </code></pre>
  
  <p>which resulted in several merge conflicts. i resolved these conflicts with</p>
  
  <pre><code>git mergetool
  </code></pre>
  
  <p>But now, I realized, there are some files missing within the result I have to commit.
  So there are two questions: Shouldn't be there all merged items on my hard disk after merging? How can I proceed to get the real merge result (master + my feature branch).</p>