There is a workaround for this situation:
-
save your stash as a patch file:
$ git stash show -p > stash.patch
-
apply this patch, skipping the conflicts (you will be asked for resolution of conflicts, just skip missing files):
$ patch -p1 < stash.patch
Don't forget to clean up stash.patch
…
Top comments (0)