🍒 Cherry pick PR #21447 to staging 🍒 #21450
Closed
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
|
This pull request has merge conflicts and can not be automatically merged. 😞 |
|
@aldo-expensify Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Comment on lines
+105
to
+110
| <<<<<<< HEAD | ||
| - name: Create Pull Request | ||
| ======= | ||
| - name: Create Pull Request to manually finish CP | ||
| if: fromJSON(steps.cherryPick.outputs.HAS_CONFLICTS) | ||
| >>>>>>> cca6daf07a (Merge pull request #21447 from Expensify/Rory-FixBadFromJSON) |
There was a problem hiding this comment.
we're just gonna close this PR
|
Sorry, we're just testing / working through kinks for now |
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.
🍒 Cherry pick #21447 to staging 🍒