title: Merging two features based on the same branch
body: <p>I'm contributing to a repository called <a href="https://github.com/jprichardson/node-fs-extra" rel="nofollow"><code>jprichardson/fs-extra</code></a>. I have my fork <a href="https://github.com/reggi/node-fs-extra" rel="nofollow"><code>reggi/node-fs-extra</code></a>. I developed two separate feature branches that have not been accepted to master yet, I'd like to have a branch that I can use merging both features.</p>
  
  <ul>
  <li><a href="https://github.com/reggi/node-fs-extra/tree/feature/ensurefile" rel="nofollow">branch for <code>ensureFile</code> feature</a></li>
  <li><a href="https://github.com/reggi/node-fs-extra/tree/feature/ensurelink-ensuresymlink" rel="nofollow">branch for <code>ensureSymlink &amp; ensureLink</code> feature</a></li>
  </ul>
  
  <p>I'd like to have a new branch <code>enhanced</code> that is a merge of both of these branches. I've tried merging several times. This is the problem.</p>
  
  <ul>
  <li>The branch <code>feature/ensurelink-ensuresymlink</code> renames the existing <code>index.js</code> file <a href="https://github.com/reggi/node-fs-extra/blob/feature/ensurelink-ensuresymlink/lib/ensure/file.js" rel="nofollow"><code>file.js</code></a>, and creates a new <code>index.js</code> file.</li>
  <li>The branch <code>feature/ensurefile</code> edits the <a href="https://github.com/reggi/node-fs-extra/blob/dev/ensurefile/lib/ensure/index.js" rel="nofollow"><code>index.js</code></a> file.</li>
  </ul>
  
  <p>What I need is to merge <code>feature/ensurefile</code>'s <code>index.js</code> with <code>feature/ensurelink-ensuresymlink</code> file.js.</p>
  
  <p>Is there a way to do this?</p>