title: Merge two branches to create new branch
body: <p>We have a few branches...</p>
  
  <ul>
  <li><code>master</code> is our dev branch.</li>
  <li><code>feature-newfeature</code> is a new feature.</li>
  <li><code>feature-tempfeature</code> is a new feature that our product team have asked for until new feature is created. <code>feature-newfeature</code> was started a while ago and hasn't been merged into <code>master</code> yet (but there have been other changes to <code>master</code>).</li>
  </ul>
  
  <p>We have now been instructed to put this temp feature in which needs all the changes from <code>master</code> - so its a releasable build - but also needs some of the stuff we've been working on in <code>newfeature</code> (as they say "you can reuse some of the stuff you've already done").</p>
  
  <p>How would it be best to go about doing this? I have created <code>feature-tempfeature</code> from the <code>master</code> branch. <code>feature-newfeature</code> isn't finished, and I don't want to merge it into master.</p>
  
  <p>I don't want to just use <code>feature-newfeature</code> either because we want to be able to keep working on that in parallel.</p>
  
  <p>How would you sort out this issue in your dev environment?</p>
  
  <p>Many thanks!</p>