Repository navigation
Conversation
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.
Resolves the merge conflict in #29289:
_PACKAGE_LINE_BUDGETintest/test_security_gate_liveness.pyset to main + 1 (currently34_353) with both#:notes kept. The change itself is byte-identical toc15ea302c4rebased (same patch-id as fork PR #26407's head; 13 files, +108/−15); the only edit beyond the merge is the budget line. Merging this into the takeover branch makes #29289 mergeable; no review needed beyond the budget line. Fork PR #26407 carries the same tree.This is
c15ea302c4plus a merge of main, so it fast-forwards; alternatively force-push #26407's head (currently38cfdbd71e) over this branch for a single-commit shape. The branch is re-merged whenever main raises the budget again, so the SHA here can move; the shape does not.