Commit Graph

6 Commits

Author SHA1 Message Date
Declan Carroll
d027f2c286
ci: Defer sync lockfile conflicts (no-changelog) (#38942) 2026-09-17 11:13:50 +00:00
Matsu
6b7455f8ee
ci: Drop the abandoned-conflict-PR warning from the 3.x sync PR body (no-changelog) (#37098)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-31 06:57:26 +00:00
Matsu
0dbff64652
ci: Handle marker-less delete/modify conflicts in the master→3.x sync (#37072) 2026-08-26 07:15:10 +00:00
Matsu
4e8cfbda42
ci: Auto-resolve mechanical master→3.x sync conflicts (no-changelog) (#35922)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-08-10 08:40:33 +00:00
Matsu
bf51b1ff03
ci: Replay 3.x onto master instead of merging into it (no-changelog) (#35435)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-04 06:49:52 +00:00
Matsu
885c250b12
ci: Set up v3 branch sync and nightly build workflows (no-changelog) (#33678)
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-09 12:49:39 +03:00