title: Git Stash equivalent of --theirs
body: <p>I'm fairly new to git via command line, but I've seen that you can use --theirs and --ours to resolve merge conflicts - But this seems to only work with git checkout. Is there a way to do a similar thing when using git stash pop / git stash apply? i.e. When I pop from the stash it creates a load of conflicts. Rather than resolve each one individually, is there a way to instantly resolve them all one way or the other?</p>
  
  <p>Thanks</p>