chore: reconcile main into v4_development (ancestry merge)

[pmathew92]

Summary

Records main (tip 68202cb5, Release 3.21.0) as a merged ancestor of v4_development via a git merge -s ours commit, so the v4 → main release PR becomes conflict-free.

The v4 tree is unchanged — git diff against v4_development HEAD is empty. This commit only adds the ancestry link (second parent = main); no file content changes.

⚠️ MUST be merged as a MERGE COMMIT — do NOT squash or rebase

This PR's entire purpose is the second parent pointing at main. Squash or rebase will flatten the merge and discard that parent, leaving main still not an ancestor of v4_development — exactly what happened to the previous attempt (#1009 was squash-merged, which dropped the ancestry and left the release PR conflicting).

Use the "Create a merge commit" option only.

Verification

• Merge parents: v4_development HEAD (5956c0c1) + origin/main tip (68202cb5).
• git diff HEAD origin/v4_development = empty (tree identical; v4 restructuring fully preserved).

After this merges

main becomes an ancestor of v4_development, so a fresh v4 → main release PR (4.0.0) will show zero conflicts.

[coderabbitai]

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: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: b579ad92-a8e0-4087-840d-81c7263eb061

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch chore/reconcile-main-ancestry

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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