Skip to content

fixes #38 Improve close comment in manual-merge.sh #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattsgarlata merged 1 commit into from
Feb 25, 2026
Merged

fixes #38 Improve close comment in manual-merge.sh #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manual-merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ ISSUE_NUMBERS=$(gh issue list --label "merge conflict" --state open --json numbe
if [[ -n "$ISSUE_NUMBERS" ]]; then
for issue in $ISSUE_NUMBERS; do
log_info " Closing issue #$issue"
gh issue close "$issue" --comment "Manually reset merge state." || log_warn " Failed to close issue #$issue"
gh issue close "$issue" --comment "Fixed using https://github.com/SpiderStrategies/merge-bot/blob/main/manual-merge.sh" || log_warn " Failed to close issue #$issue"
done
else
log_info " No open merge conflict issues to close."
Expand Down