Skip to content

Commit 7a292be

Browse files
drnclaude
andcommitted
Remove rebase merge fallback to enforce squash-only merges.
Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 6830879 commit 7a292be

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

agents/skills/merge/scripts/merge.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,7 @@ do_merge() {
165165
return 0
166166
fi
167167

168-
info "Auto-merge failed, falling back to rebase merge..."
169-
170-
# Attempt 4: rebase merge
171-
if gh pr merge "$PR_NUMBER" --repo "$REPO_SLUG" --rebase 2>/dev/null; then
172-
MERGE_METHOD="rebase"
173-
return 0
174-
fi
175-
176-
die 1 "All merge strategies failed for PR #${PR_NUMBER}"
168+
die 1 "All squash merge strategies failed for PR #${PR_NUMBER}"
177169
}
178170

179171
update_local_master() {

0 commit comments

Comments
 (0)