Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #11531
Description
Resolving this issue revealed underlying issues in
Desktop
's current implementation and handling of git stashes that affected the solution I went with:Desktop
only recognizes and manages git stashes made by Desktop.Desktop
doesn't fully manage all of a branch's stashes.git stash
commands can't "ammend" existing stashes.Given these issues, there is no currently defined right approach that
Desktop
adheres to.Leading me to decide to try to solve the issue from the user experience POV the issue itself expected -
A singular stash
Desktop
is familiar with that can be ammended.The actual implementation I went with:
Desktop
stash by usinggit stash pop
then pushing back with the new changes.Screenshots
Release notes
Notes: