From c844a34929fa108ec445c3626f7e1912bcac295d Mon Sep 17 00:00:00 2001 From: Stackwright Bot Date: Fri, 15 May 2026 14:54:29 -0400 Subject: [PATCH] fix(ci): handle modify/delete conflict on pre.json during back-merge rebase --- .changeset/fix-back-merge-pre-json-conflict.md | 5 +++++ .github/workflows/release.yml | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .changeset/fix-back-merge-pre-json-conflict.md diff --git a/.changeset/fix-back-merge-pre-json-conflict.md b/.changeset/fix-back-merge-pre-json-conflict.md new file mode 100644 index 00000000..5bb72d97 --- /dev/null +++ b/.changeset/fix-back-merge-pre-json-conflict.md @@ -0,0 +1,5 @@ +--- +"@stackwright/cli": patch +--- + +Fix back-merge into dev failing with a modify/delete conflict on `.changeset/pre.json` during rebase. The release workflow deletes this file via `changeset pre exit`, but dev's alpha-bump commits still reference it. The rebase now explicitly resolves the conflict by accepting main's deletion and continuing. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84e4eb3e..56d1e8ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,7 +134,13 @@ jobs: # # -X ours: when conflicts arise (e.g. version numbers in package.json), # prefer main's graduated stable versions over dev's stale alpha versions. - git rebase origin/main -X ours + 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 + } # Re-enter prerelease mode so the next dev push produces alphas. if [ ! -f ".changeset/pre.json" ]; then pnpm changeset pre enter alpha