chore: sync integrated refused-origin parent into Max-Forwards lane - #120
Merged
seonghobae merged 4 commits intoSep 19, 2026
Merged
seonghobae merged 4 commits into
seonghobae merged 4 commits into
Conversation
…-failure-recovery-v2 test: reconcile pg-erd refused-origin recovery on integrated runtime parent
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This was referenced Sep 19, 2026
This file contains hidden or 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
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.
Parent-sync repair for #106. GitHub initially reported the reverse sync non-mergeable because
CHANGELOG.md/TEST_STRATEGY.mdhad valid concurrent child and parent edits, so no automatic conflict resolution was accepted.The parent delta was then inherited through ordinary/non-force manual composition on the #106 branch: two-parent commit
b9dbbfe33d75b3799d4fa490a3ebde4ded6df597records previous child exact40dd054df368b141d7a9d15224aaecdd91415805plus integrated parent40e10607601bf9722d642d4a4bb18f02806c20cc; the #119 refused-origin fixture was inherited unchanged;CHANGELOG.mdandTEST_STRATEGY.mdwere semantically composed rather than choosing either side wholesale. Because that merge commit made the parent head an ancestor of the child base, GitHub records this parent-sync PR as merged atb9dbbfe....Current #106 exact
dbecf6e43372e52d8af46e734fb74df83d63399dhas merge-base exactly40e106..., behind 0, and its effective delta against the live parent is again only the ten Max-Forwards-owned paths. No force-push, destructive rebase, self-approval, gate weakening, release, or cutover claim.