Re-post the conflict comment when the resumed head lacks the squash commit#62
Merged
Merged
Conversation
…ommit A PR whose conflict comment predates the git-merge-onto switch got stranded: on resume the new head-contains-squash check failed, and the error told the user to run a git-merge-onto command their (old-format) comment never contained. Every push re-hit the same red run. When the resumed head lacks the squash commit, re-post the current conflict comment and keep the label armed instead of dead-ending, so the next push has working instructions. Also covers pushing before the re-parent is finished. The run still returns nonzero so the PR reads as unresolved. Observed on scortexio/sensei#7997. Co-Authored-By: Claude Opus 4.8 (1M context) <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.
A PR whose conflict comment predates the git-merge-onto switch got stranded: on resume the new head-contains-squash check failed, and the error told the user to run a
git-merge-ontocommand their (old-format) comment never contained. Every push re-hit the same red run.When the resumed head lacks the squash commit, re-post the current conflict comment and keep the label armed instead of dead-ending, so the next push has working instructions. Also covers pushing before the re-parent is finished. The run still returns nonzero so the PR reads as unresolved.
Observed on scortexio/sensei#7997.
🤖 Generated with Claude Code