fix: Stash pop removes stash from list even when there are conflicts #2382
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wugeer
force-pushed
the
fix_issue_2372
branch
2 times, most recently
from
561af4a
to
fe743bd
Compare
|
@extrawurst Hello, could you please take a moment to review this PR? If the changes aren't good enough, I'll continue working on improving them. :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This Pull Request fixes/closes #2372 .
It changes the following:
stash_popnot remove stash from list even when there are conflictsbefore change
before1005.webm
after change
after1005.webm
stash pop success
success1005.webm
I followed the checklist:
make checkwithout errors