Skip to content

chore: sync integrated refused-origin parent into Max-Forwards lane - #120

Merged
seonghobae merged 4 commits into
fix/pg-erd-max-forwards-v1from
fix/pg-erd-listener-wildcard-collision-v1
Sep 19, 2026
Merged

seonghobae merged 4 commits into
fix/pg-erd-max-forwards-v1from
fix/pg-erd-listener-wildcard-collision-v1

Conversation

@seonghobae

@seonghobae seonghobae commented Sep 19, 2026 •

Copy link
Copy Markdown
Contributor

Parent-sync repair for #106. GitHub initially reported the reverse sync non-mergeable because CHANGELOG.md / TEST_STRATEGY.md had 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 b9dbbfe33d75b3799d4fa490a3ebde4ded6df597 records previous child exact 40dd054df368b141d7a9d15224aaecdd91415805 plus integrated parent 40e10607601bf9722d642d4a4bb18f02806c20cc; the #119 refused-origin fixture was inherited unchanged; CHANGELOG.md and TEST_STRATEGY.md were 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 at b9dbbfe....

Current #106 exact dbecf6e43372e52d8af46e734fb74df83d63399d has merge-base exactly 40e106..., 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.

@coderabbitai

coderabbitai Bot commented Sep 19, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 02b25f77-ecd5-4233-bca1-d453dba26bda

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@seonghobae
seonghobae merged commit b9dbbfe into fix/pg-erd-max-forwards-v1 Sep 19, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant