fix(ci): handle modify/delete conflict on pre.json during back-merge rebase

[perasperaactual]

Problem

The Back-merge into dev step in the release workflow fails with:

CONFLICT (modify/delete): .changeset/pre.json deleted in HEAD and modified in ffce9aa (chore: bump prerelease versions)
error: could not apply ffce9aa... chore: bump prerelease versions

Root Cause

git rebase origin/main -X ours auto-resolves content conflicts but not modify/delete conflicts. When the release exits prerelease mode (changeset pre exit deletes .changeset/pre.json on main), then tries to rebase dev's alpha-bump commits (which modified pre.json) on top — git halts with a structural conflict.

The -X ours flag is helpless here: it only applies to three-way content merges, not to structural modify/delete cases. Git stops, demands manual intervention, and exits 1 in CI.

Fix

Added an explicit conflict handler after the rebase command. If the rebase fails, it removes .changeset/pre.json (accepting main's intentional deletion) and calls git rebase --continue. GIT_EDITOR=true prevents git from trying to open an interactive editor for the commit message in the non-interactive CI environment.

git rebase origin/main -X ours || {
  # Expected modify/delete conflict on .changeset/pre.json:
  # release deleted it via `changeset pre exit`, but dev's alpha-bump
  # commit still referenced it. Accept main's deletion and continue.
  git rm -f .changeset/pre.json 2>/dev/null || true
  GIT_EDITOR=true git rebase --continue
}

The existing if [ ! -f ".changeset/pre.json" ] block immediately after correctly re-enters prerelease mode once the rebase completes cleanly.

Related

Follows on from #424 (js-yaml override conflict fix) — publish now succeeds ✅, this unblocks the back-merge step.

[github-actions]

✅ Visual Regression Test Results

Status: ✅ All visual tests passed!

All screenshots match the baseline. No visual regressions detected! 🎉

[github-actions]

⚡ Performance Benchmark Results

✅ Build Time Benchmarks: PASSED

✅ Bundle Size Benchmarks: PASSED

❌ Runtime Vitals Benchmarks: FAILED

📝 Note: Detailed results are available in the job logs.

🎯 Performance Budgets:

• Build time: <70s total
• First-load JS: <100KB gzipped
• FCP: <1.5s, LCP: <2.5s, TTI: <3s

---

Updated: 2026-05-15T18:58:12.212Z

[github-actions]

♿ Accessibility Test Results

Overall Status: ✅ 0/0 tests passed

🦮 WCAG 2.1 AA Compliance

No WCAG test results available

⌨️ Keyboard Navigation

No keyboard navigation test results available

---

⚠️ No accessibility tests were executed. Check the workflow logs for setup issues.

📊 Detailed Report

Download the full HTML accessibility report from the workflow artifacts for:

• Detailed WCAG violation descriptions
• Specific element selectors and fixes
• Color contrast issues
• Keyboard navigation flow analysis

🔍 Testing Checklist

Our accessibility tests verify:

• ✅ WCAG 2.1 Level AA compliance
• ✅ Color contrast in light and dark modes
• ✅ Tab key navigation through all interactive elements
• ✅ Focus indicators are visible
• ✅ No keyboard traps
• ✅ Skip links and ARIA landmarks
• ✅ Screen reader compatibility

---

Powered by @axe-core/playwright and Playwright