search

twosigma / git-meta

Repository for the git-meta project -- build your own monorepo using Git submodules
http://twosigma.github.io/git-meta
BSD 3-Clause "New" or "Revised" License
216 stars 50 forks source link

git meta stash loses stash on failed merge #701

Open tslally opened 5 years ago

tslally commented 5 years ago

If the stash-pop command fails from a conflict in one submodule, changes from that stash in other submodules don't get applied. They're also gone from the list of stashes.

tslally commented 5 years ago

Actually it seems to cause another stash in the stack to disappear.