title: Git Merge subdirectory to branch to root directory of master
body: <p>I have a branch that has the content of the master branch as a subdirectory. Now I made some changes to this subdirectory. Ideally I want to be able to merge these changes back into the master branch.</p>
  
  <p>Branch layout:</p>
  
  <pre><code>index.html
  subdirectory
    &gt; a.txt
    &gt; b.txt
  </code></pre>
  
  <p>Master layout</p>
  
  <pre><code>a.txt
  b.txt
  </code></pre>
  
  <p>How would I go about doing this? Is it even a good approach? In SVN I avoided merging subdirectories back into the trunk. But this is a somewhat different use case, the layout of both, the branch and master, will never change.</p>