pick-to-branch: Improve fix of behavior on failed cherry-pick #99
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
paulidale
approved these changes
Nov 17, 2021
t8m
approved these changes
Nov 18, 2021
|
Please merge |
|
This needs rebase now. |
DDvO
force-pushed
the
pick-to-branch_fix_abort
branch
from
616ae91
to
c8be59c
Compare
|
Done rebasing. |
t8m
approved these changes
Nov 22, 2021
openssl-machine
pushed a commit
that referenced
this pull request
Nov 22, 2021
Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #99)
|
Merged. Thank you. |
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.
I meanwhile found that the recently merged solution is not sufficient
(namely, for situations where the user aborts cherry-picking etc. using Ctrl-C),
so this PR strengthens it.