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

..

beta.yml

ci: auto-resolve merge conflicts in beta sync using opencode

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

close-stale-prs.yml

ci: add ratelimits handling for close-stale-prs.yml (#11578)

2026-02-02 10:13:48 -06:00

compliance-close.yml

fix: update workflows for better automation (#14809)

2026-02-23 16:51:29 -05:00

containers.yml

ci

2026-01-29 23:17:57 -05:00

daily-issues-recap.yml

ci: filter daily recaps to community-only and fix vouch workflow authentication (#12910)

2026-02-09 22:29:18 -05:00

daily-pr-recap.yml

ci: filter daily recaps to community-only and fix vouch workflow authentication (#12910)

2026-02-09 22:29:18 -05:00

deploy.yml

ci: Fix Pulumi version conflict in deploy workflow

2026-02-01 21:39:24 -05:00

docs-locale-sync.yml

chore: updated locale glossaries and docs sync workflow

2026-02-21 04:58:27 -06:00

docs-update.yml

test: skip failing tests (#11184)

2026-01-29 18:57:59 +00:00

duplicate-issues.yml

chore: add compliance checks for issues and PRs with recheck on edit (#14170)

2026-02-18 17:20:23 -05:00

generate.yml

ci

2026-01-30 12:55:58 -05:00

nix-eval.yml

ci: add nix-eval workflow for cross-platform flake evaluation (#12175)

2026-02-18 00:03:37 -06:00

nix-hashes.yml

ci: allow commits on top of beta PRs (#11924)

2026-02-18 00:20:05 -06:00

notify-discord.yml

test: skip failing tests (#11184)

2026-01-29 18:57:59 +00:00

opencode.yml

anomalyco/opencode

2026-01-02 16:09:06 -05:00

pr-management.yml

chore: add compliance checks for issues and PRs with recheck on edit (#14170)

2026-02-18 17:20:23 -05:00

pr-standards.yml

fix: update workflows for better automation (#14809)

2026-02-23 16:51:29 -05:00

publish-github-action.yml

.github/workflows: Migrate workflows to Blacksmith runners (#4941)

2025-12-01 09:43:33 -05:00

publish-vscode.yml

.github/workflows: Migrate workflows to Blacksmith runners (#4941)

2025-12-01 09:43:33 -05:00

publish.yml

upgrade to bun 1.3.10 canary and force baseline builds always (#14843)

2026-02-24 16:06:45 +10:00

release-github-action.yml

ci: fix branch name

2025-12-16 14:35:42 -06:00

review.yml

test: skip failing tests (#11184)

2026-01-29 18:57:59 +00:00

sign-cli.yml

upgrade to bun 1.3.10 canary and force baseline builds always (#14843)

2026-02-24 16:06:45 +10:00

stale-issues.yml

test: skip failing tests (#11184)

2026-01-29 18:57:59 +00:00

stats.yml

sync

2026-01-05 11:13:59 -05:00

sync-zed-extension.yml

ci: update token var

2025-12-29 18:16:17 -06:00

test.yml

ci: add Windows to unit test matrix (#14836)

2026-02-24 09:33:33 +10:00

triage.yml

test: skip failing tests (#11184)

2026-01-29 18:57:59 +00:00

typecheck.yml

ci: enable typecheck on push to dev branch to catch type errors immediately after merge

2026-02-01 22:32:45 -05:00

vouch-check-issue.yml

feat: integrate vouch & stricter issue trust management system (#12640)

2026-02-09 18:15:06 -05:00

vouch-check-pr.yml

feat: integrate vouch & stricter issue trust management system (#12640)

2026-02-09 18:15:06 -05:00

vouch-manage-by-issue.yml

ci: filter daily recaps to community-only and fix vouch workflow authentication (#12910)

2026-02-09 22:29:18 -05:00