title: git merge branches with different directory structures
body: <p>I am somewhat new to git, I've been using it for a number of months, and Im comfortable doing most of the basic tasks.  So... I think its time to take on some more complicated tasks.
  At my work, we have a few people working on older code to update it, this involves actual code work and updating the directory structure to be more modular.  My question is can these two things be done in parallel branches and then merged or rebased.  My intuition says no, because dir restructure is a rename, and git renames by adding a new file and deleting the old (least this is how i understand it).  But I wanted to be sure.<br>
  Here's the scenario:
  parent-branch looks like:</p>
  
  <pre><code>├── a.txt
  ├── b.txt
  ├── c.txt
  </code></pre>
  
  <p>then we branch two say, branchA and branchB.  In branchB we modify the structure:</p>
  
  <pre><code>├── lib
  │   ├── a.txt
  │   └── b.txt
  └── test
      └── c.txt
  </code></pre>
  
  <p>Then in branchA we update a,b, and c.</p>
  
  <p>Is there someway to merge the changes done in branchA with the new structure in branchB?
  rebase comes to mind, however, I don't think lib/a.txt is actually connected to a.txt after a git mv...</p>
  
  <p>Jameson </p>