From fafabffaa75838f147a2031048102a8e905778d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Rubinstein?= Date: Wed, 8 Apr 2026 12:29:51 +0200 Subject: [PATCH] Reword conflict comment to avoid retargeting confusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The prior wording ("I will pick-up from there and continue retargetting") risked reinforcing the idea that users might need to run `gh pr edit --base` themselves. It also oversold the scope — only the commented PR is resumed, not "the stack". --- update-pr-stack.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/update-pr-stack.sh b/update-pr-stack.sh index f540e94..ab4d39a 100755 --- a/update-pr-stack.sh +++ b/update-pr-stack.sh @@ -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' @@ -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