chore: back-merge main into development - #262
Merged
Merged
Conversation
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
🔒 Security Scan Results
⏱️ SLA Breach Summary
✅ BUILD PASSED - All security checks passed |
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
No unresolved review issues were identified.
Review effort: Lite
Findings: None
What changed in this PR
Back-merges main into development by synchronizing CODEOWNERS.
Changes:
- Updates default code ownership.
- Consolidates workflow, Snyk, and
CODEOWNERSownership rules.
| File | Description |
|---|---|
CODEOWNERS |
Synchronizes repository ownership rules with main. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
cs-raj
approved these changes
Sep 22, 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.
What
Back-merges
mainintodevelopmentvia an intermediate branch, bringing across the two CODEOWNERS commits (5a42146,b7eca21).CODEOWNERSis the only file changed, and its contents now matchmainexactly.Why not merge
mainintodevelopmentdirectlymainanddevelopmenthad diverged in both directions:mainwas ahead by 2 commits (CODEOWNERS)developmentwas ahead by 5 commits (the 1.5.3 dependency bumps and changelog)With "require branches to be up to date before merging" enabled, that deadlocks:
development→main) reports BEHIND, wanting main's commitsmain→development) reports BEHIND, wanting development's commits#261 cannot be brought up to date the usual way, because GitHub would need
developmentmerged intomain— butmainis that PR's head branch and is protected, so it cannot be pushed to.This branch breaks the cycle: it is cut from the current tip of
development(so it is up to date with the base by construction) and hasmainmerged into it (so it carries main's commits). Both verified —origin/mainandorigin/developmentare each ancestors of this branch.Merge order
developmentdevelopment→main) then becomes up to date and can proceed with the releaseNote on the automation
back-merge-pr.ymlopensmain→developmentPRs automatically on every push tomain. Under the current branch protection those PRs will deadlock wheneverdevelopmenthas also moved on, which is the normal case. Worth tracking separately — the workflow likely wants to open the PR from an intermediate branch like this one rather than frommaindirectly.🤖 Generated with Claude Code