Skip to content

Re-post the conflict comment when the resumed head lacks the squash commit #62

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
Jul 7, 2026
Merged

Re-post the conflict comment when the resumed head lacks the squash commit #62

Show file tree
Hide file tree
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
26 changes: 26 additions & 0 deletions tests/test_conflict_resolution_resume.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,5 +280,31 @@ git -C "$ORIGIN" rev-parse --verify -q parent >/dev/null || fail "I: old base br
grep -q -- "push origin :parent" "$CALLS" && fail "I: deletion must not be attempted"
ok "I: sibling-listing API failure keeps the old base branch"

# ---------------------------------------------------------------------------
echo "### Scenario J: head lacks the squash commit -> re-post the comment, keep the label"
setup_repo
# The pushed resolution does not contain the squash commit: the user pushed
# early, or followed an old-format comment (a prior action version) whose
# resolution never folds it in. Advance main with a commit the child lacks so
# the ancestry check fails.
git checkout -q main
echo squash > s.txt && git add s.txt && git commit -qm squash
SQUASH2=$(git rev-parse main)
git push -q origin main
git checkout -q child
MOCK_LABELS="autorestack-needs-conflict-resolution"
PR_BASE="parent" # matches marker -> not a manual retarget
MOCK_COMMENTS_FILE="$WORK/comments.txt"
{ echo "### conflict"; echo; marker parent main "$SQUASH2"; } > "$MOCK_COMMENTS_FILE"
run_resume

grep -q "EXIT=1" "$WORK/out.log" || fail "J: run must fail while the PR is unresolved"
grep -q "gh pr comment" "$CALLS" || fail "J: conflict comment not re-posted"
grep -q -- "add-label autorestack-needs-conflict-resolution" "$CALLS" || fail "J: conflict label not kept"
grep -q "remove-label" "$CALLS" && fail "J: label must NOT be removed"
grep -q -- "--base" "$CALLS" && fail "J: base must NOT be edited"
[[ "$(git -C "$ORIGIN" rev-parse child)" == "$CHILD_BEFORE" ]] || fail "J: child was pushed"
ok "J: unresolved head re-posts the conflict comment and keeps the label armed"

echo
echo "All conflict-resume tests passed 🎉 ($PASS scenarios)"
68 changes: 40 additions & 28 deletions update-pr-stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,38 @@ abort_merge_if_in_progress() {
fi
}

# Post the conflict-resolution comment and add the conflict label.
# Args: head branch, merged parent branch, final target branch, squash hash, PR number.
# The user re-parents the head from MERGED onto TARGET with git-merge-onto; the
# state marker records both plus the squash so the resume can finalize.
post_conflict_comment() {
local BRANCH="$1" MERGED="$2" TARGET="$3" SQUASH_HASH="$4" PR_NUMBER="$5"
{
echo "### ⚠️ Automatic update blocked by a merge conflict"
echo
echo "Resolve it like this:"
echo '```bash'
echo "git fetch origin"
echo "git switch $BRANCH"
echo "git merge --ff-only origin/$BRANCH"
echo "uvx git-merge-onto origin/$TARGET origin/$MERGED --absorbed"
echo '```'
echo
echo 'Fix the conflicts (for instance with `git mergetool`), then run `git add -A && git commit` to finish the merge.'
echo
echo '```bash'
echo "git push origin $BRANCH"
echo '```'
echo
echo "Once you push, this action will resume and finish updating this pull request."
echo
format_state_marker "$MERGED" "$TARGET" "$SQUASH_HASH"
} | try gh pr comment "$PR_NUMBER" -F - \
|| die "could not post the conflict-resolution comment on PR #$PR_NUMBER"
gh label create "$CONFLICT_LABEL" --description "PR needs manual conflict resolution" --color "d73a4a" 2>/dev/null || true
run gh pr edit "$PR_NUMBER" --add-label "$CONFLICT_LABEL"
}

# Args: head branch, base branch, PR number. git commands use the branch; gh
# commands use the number, since a head branch can carry several PRs.
update_direct_target() {
Expand Down Expand Up @@ -180,30 +212,7 @@ See $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
abort_merge_if_in_progress
local SQUASH_HASH_FOR_MARKER
SQUASH_HASH_FOR_MARKER=$(git rev-parse SQUASH_COMMIT) || die "cannot resolve SQUASH_COMMIT"
{
echo "### ⚠️ Automatic update blocked by a merge conflict"
echo
echo "Resolve it like this:"
echo '```bash'
echo "git fetch origin"
echo "git switch $BRANCH"
echo "git merge --ff-only origin/$BRANCH"
echo "uvx git-merge-onto origin/$BASE_BRANCH origin/$MERGED_BRANCH --absorbed"
echo '```'
echo
echo 'Fix the conflicts (for instance with `git mergetool`), then run `git add -A && git commit` to finish the merge.'
echo
echo '```bash'
echo "git push origin $BRANCH"
echo '```'
echo
echo "Once you push, this action will resume and finish updating this pull request."
echo
format_state_marker "$MERGED_BRANCH" "$TARGET_BRANCH" "$SQUASH_HASH_FOR_MARKER"
} | try gh pr comment "$PR_NUMBER" -F - \
|| die "could not post the conflict-resolution comment on PR #$PR_NUMBER"
gh label create "$CONFLICT_LABEL" --description "PR needs manual conflict resolution" --color "d73a4a" 2>/dev/null || true
run gh pr edit "$PR_NUMBER" --add-label "$CONFLICT_LABEL"
post_conflict_comment "$BRANCH" "$MERGED_BRANCH" "$TARGET_BRANCH" "$SQUASH_HASH_FOR_MARKER" "$PR_NUMBER"
return 1
}

Expand Down Expand Up @@ -324,10 +333,13 @@ continue_after_resolution() {
run git update-ref SQUASH_COMMIT "$SQUASH_HASH"
run git checkout "$PR_BRANCH"
if ! git merge-base --is-ancestor SQUASH_COMMIT "$PR_BRANCH"; then
# Fail loudly rather than silently: the user pushed without finishing the
# re-parent, so a red run is the signal they need to look again.
echo "❌ '$PR_BRANCH' does not contain the squash commit; the conflict is not resolved." >&2
echo " Follow the conflict comment on this PR (run its git-merge-onto command), then push again." >&2
# The head does not contain the squash commit: the user pushed without
# finishing the re-parent, or followed an old-format conflict comment (a
# prior action version) whose resolution never folds the squash in. Re-post
# the current instructions and keep the label on so the next push resumes.
# Still return 1: a red run flags that the PR is not resolved yet.
echo "⚠️ '$PR_BRANCH' does not contain the squash commit yet; re-posting the conflict comment." >&2
post_conflict_comment "$PR_BRANCH" "$OLD_BASE" "$NEW_TARGET" "$SQUASH_HASH" "$PR_NUMBER"
return 1
fi

Expand Down
Loading