Skip to content

Reword conflict comment to avoid retargeting confusion #31

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
Phlogistique merged 1 commit into from
Apr 8, 2026
Merged

Reword conflict comment to avoid retargeting confusion #31

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
5 changes: 3 additions & 2 deletions update-pr-stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ update_direct_target() {
echo
echo -n "I tried to merge "
format_branch_list_for_text "${CONFLICTS[@]}"
echo
echo "into this branch while updating the PR stack and hit conflicts."
echo " into this branch while updating the pull request stack and hit conflicts."
echo
echo "#### How to resolve"
echo '```bash'
Expand All @@ -109,6 +108,8 @@ update_direct_target() {
done
echo "git push"
echo '```'
echo
echo "Once you push, this action will resume and finish updating this pull request."
} | log_cmd gh pr comment "$BRANCH" -F -
# Create the label if it doesn't exist, then add it to the PR
gh label create "$CONFLICT_LABEL" --description "PR needs manual conflict resolution" --color "d73a4a" 2>/dev/null || true
Expand Down
Loading