Tidy the conflict-resolution comment#40
Merged
Merged
Conversation
The resolution steps told the user to `git merge <40-char hash>` with no hint of what that commit is. Gloss it inline as the target branch as it was just before the merged branch landed. Also drops the redundant "I tried to merge ..." header sentence and its only helper, format_branch_list_for_text: the merge commands now carry that information. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Dropping the intro paragraph had left two headers back to back. The warning header now leads straight into a one-line lead-in and the steps. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Phlogistique
marked this pull request as ready for review
June 2, 2026 08:11
The resolution steps ran `git fetch origin` and then `git pull origin <branch>`, which fetches the branch a second time. The standalone fetch already has every ref the later merges need, so update the local branch with a local fast-forward to the fetched tip. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Phlogistique
changed the title
Phlogistique
pushed a commit
that referenced
this pull request
Jun 9, 2026
Since #40 the conflict comment's fast-forward step reads `git merge --ff-only origin/<branch>`, which assert_conflict_comment_merges picks up with its `^git merge` grep, so the extracted commands never match the expected conflict merges. Skip the --ff-only line when extracting. Also trim the new comments in the fan-out push/retarget/delete sequence. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
Phlogistique
added a commit
that referenced
this pull request
Jun 9, 2026
Since #40 the conflict comment's fast-forward step reads `git merge --ff-only origin/<branch>`, which `assert_conflict_comment_merges` picks up with its `^git merge` grep, so the extracted commands never match the expected conflict merges and the check fails on every conflict scenario. #40's test tweak only handled the new `# ...` hash gloss, not the new merge line. This went unnoticed because `tests.yml` only runs on `pull_request`, so the breakage only surfaced on the first PR after #40 landed (#42, [run 27235483781](https://github.com/scortexio/autorestack-action/actions/runs/27235483781)). Fix: skip the `--ff-only` line when extracting merge commands. Verified green as part of #42's [run 27235912022](https://github.com/scortexio/autorestack-action/actions/runs/27235912022) before being split out into this PR. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX --- _Generated by [Claude Code](https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX)_ Co-authored-by: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Three polishes to the comment the action posts when a stack update hits conflicts:
git mergestep as the target branch as it was just before the merged branch landed, so the user knows what they are merging.git pull origin <branch>withgit merge --ff-only origin/<branch>. The precedinggit fetch originalready has every ref the steps need, so the pull only fetched the branch a second time.format_branch_list_for_text) now that the merge commands carry that context, plus the sub-header it left stranded.🤖 Generated with Claude Code