Skip to content

Commit 7ce056a

Browse files
JOYclaude
andcommitted
fix: delete stale sync branch before push in upstream sync workflow
Push fails when sync-upstream-* branch already exists from previous failed run. Delete remote branch first to avoid conflict. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 8175d23 commit 7ce056a

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.github/workflows/sync-upstream.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ jobs:
227227
228228
git add -A
229229
git commit -m "WIP: Merge upstream $TAG (has conflicts)" --no-verify || true
230+
git push origin --delete "$BRANCH" 2>/dev/null || true
230231
git push origin "$BRANCH"
231232
232233
REMAINING=$(echo "${{ steps.merge.outputs.conflict_files }}" | head -20)

0 commit comments

Comments
 (0)