Dax Raad a487f11a30 ci: auto-resolve merge conflicts in beta sync using opencode ...

When merging PRs into the beta branch, the sync script now attempts to automatically resolve merge conflicts using opencode before failing. This reduces manual intervention needed for beta releases when multiple PRs have overlapping changes.

2026-02-24 23:17:31 -05:00

905 B

Raw Permalink Blame History

View Raw