summaryrefslogtreecommitdiffhomepage
path: root/packages/function
diff options
context:
space:
mode:
authorDax Raad <[email protected]>2026-02-24 23:17:31 -0500
committerDax Raad <[email protected]>2026-02-24 23:17:31 -0500
commita487f11a30981f44896ac771f7ade87fba9d6092 (patch)
treea02b5992af4474a7f195190a8f206c7e8c21c9dd /packages/function
parent637059a515a6afd983a8a615f90650d997a821ce (diff)
downloadopencode-a487f11a30981f44896ac771f7ade87fba9d6092.tar.gz
opencode-a487f11a30981f44896ac771f7ade87fba9d6092.zip
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.
Diffstat (limited to 'packages/function')
0 files changed, 0 insertions, 0 deletions