title: Rebase from another branch and then merge into master after merged the other branch
body: <p>I'm in this scenario:</p>
  
  <ul>
  <li>I have a master with a production version</li>
  <li>I worked on a new feature from master, without graphics (call it <code>feature</code>)</li>
  <li>In the same time, my team worked on a new branch from master for a new graphics features (call it <code>graphics</code>), where I worked too (keeping in standby the other branch)</li>
  <li>Now, the graphics is almost at the end and I come back to work into branch <code>feature</code></li>
  </ul>
  
  <p>The branch <code>graphics</code> will be merged into master after finished and reviewed, but now I want to integrate the <code>graphics</code> changes also into my branch <code>feature</code> that also will be merged with master after finished.</p>
  
  <p>So we'll have to merge the <code>feature</code> into master, after <code>graphics</code> had been already merged.</p>
  
  <p>What is the best way to do this? Could I rebase <code>feature</code> with <code>graphics</code> changes? Or merge <code>graphics</code> into <code>feature</code> (in this way will I have the merge <code>graphics</code> twice? )? Or must I cherry-pick all commits? </p>
  
  <p>I hope is clear my scenario!</p>