title: How to combine multiple stashes in git
body: <p>This is a pipeline on branch <code>frontend</code> over the last two weeks.</p>
  
  <p>| <code>Stash@{3}</code> is all code since <code>Stash@{1}</code> (excluding the two tiny commits)<br>
  | Tiny Commit<br>
  | Tiny commit<br>
  | Huge bulk commit two weeks ago, now rebased and moved to <code>Stash@{1}</code>  </p>
  
  <p>My working tree is currently clean.<br>
  <code>Stash@{1}</code> is the contents from a bulk commit of general development code two weeks ago (this should have been stashed in the first place). This commit was undone and moved to stash.<br>
  <code>Stash@{3}</code> is the newest work on that tree since <code>Stash@{1}</code> (minus a couple of changes that have been committed).  </p>
  
  <p>I need to combine these two stashes together in my working tree so I can make a number of commits from this huge pool of work.</p>
  
  <p>I ran <code>git stash apply stash@{1}</code> then I tried:</p>
  
  <p><code>git stash apply stash@{3}</code><br>
  <code>git stash show -p | git stash apply stash@{3}</code></p>
  
  <p>but I get 'dirty working tree' in both cases. How can I merge this work together? Because <code>stash@{3}</code> is newer, I want it to supersede <code>stash@{1}</code> wherever there are conflicts.</p>