wip: sanity check a conflicting backport #23
Merged
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
|
Backport failed for Please cherry-pick the changes locally. git fetch origin backport-sandbox
git worktree add -d .worktree/backport-23-to-backport-sandbox origin/backport-sandbox
cd .worktree/backport-23-to-backport-sandbox
git checkout -b backport-23-to-backport-sandbox
ancref=$(git merge-base 5dfa49a9ea1023a7078399f300f8c222c1aa5588 f689aa746295522619f44ec99a9a4fe304487558)
git cherry-pick -x $ancref..f689aa746295522619f44ec99a9a4fe304487558 |
Open
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.
No description provided.