We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 6830879 commit 7a292beCopy full SHA for 7a292be
agents/skills/merge/scripts/merge.sh
@@ -165,15 +165,7 @@ do_merge() {
165
return 0
166
fi
167
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}"
+ die 1 "All squash merge strategies failed for PR #${PR_NUMBER}"
177
}
178
179
update_local_master() {
0 commit comments