Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git meta stash loses stash on failed merge #701

Open
tslally opened this issue Apr 4, 2019 · 1 comment
Open

git meta stash loses stash on failed merge #701

tslally opened this issue Apr 4, 2019 · 1 comment

Comments

@tslally
Copy link

tslally commented Apr 4, 2019

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
Copy link
Author

tslally commented Apr 5, 2019

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@tslally