Innei baf0b56f64 🔧 ci: optimize sync-main-to-canary to merge directly when no conflicts (#12306) ...

## Summary
- Optimize the main-to-canary sync workflow to directly merge and push
when there are no conflicts, avoiding unnecessary PR creation
- When merge conflicts exist, fall back to creating a PR for manual
resolution
- Add duplicate PR detection to prevent multiple PRs on the same day

## Test plan
- [ ] Push to main with no conflicts on canary → should auto-merge
without PR
- [ ] Push to main with conflicts on canary → should create PR
- [ ] Trigger workflow twice on same day with conflicts → should not
create duplicate PRs

## Summary by Sourcery

CI:
- Update the sync-main-to-canary workflow to merge main into canary
directly on no-conflict updates, only creating a PR when merge conflicts
occur and avoiding duplicate PRs for the same sync date.

2026-02-13 17:39:19 +08:00

..

actions

🔧 chore: update eslint v2 configuration and suppressions (#12133)

2026-02-11 13:04:48 +08:00

ISSUE_TEMPLATE

🐛 fix: rename docker image and update docs for v2 (#11911)

2026-01-27 22:14:58 +08:00

scripts

Sync main branch to canary branch (#12267)

2026-02-11 23:51:35 +08:00

workflows

🔧 ci: optimize sync-main-to-canary to merge directly when no conflicts (#12306)

2026-02-13 17:39:19 +08:00

FUNDING.yml

🔨 chore: Update FUNDING.yml to add Github Sponsor [skip ci]

2024-04-25 22:14:09 +08:00

PULL_REQUEST_TEMPLATE.md

feat(router-runtime): add fallback options (#11531)

2026-01-19 11:28:54 +08:00