Simplify setup code for user repositories#20
Merged
Conversation
Collaborator
Phlogistique
commented
Dec 26, 2025
Phlogistique
commented
- Action now handles checkout with fetch-depth: 0 internally
- Auto-detects mode (squash-merge vs conflict-resolved) from event context
- Removes need for users to specify mode or pr-branch inputs
- Simplifies workflow to just trigger + single action call
- E2e tests now copy workflow from repo and sed the action reference
- E2e tests verify repo is clean and commit exists on origin before running
- Action now handles checkout with fetch-depth: 0 internally - Auto-detects mode (squash-merge vs conflict-resolved) from event context - Removes need for users to specify mode or pr-branch inputs - Simplifies workflow to just trigger + single action call - E2e tests now copy workflow from repo and sed the action reference - E2e tests verify repo is clean and commit exists on origin before running
Phlogistique
added a commit
that referenced
this pull request
Jun 1, 2026
…helpers - follow_conflict_comment now rewrites only the conflicted region to a sentinel line, keeping changes the merge brought in cleanly. The previous whole-file `git checkout --ours` dropped any clean incoming change, so the test only matched a human resolution by accident of the fixtures. - The workflow-run waiters match the run-name prefix through " - ", so "PR #2" no longer prefix-matches "PR #20"; the head-branch tiebreaker is gone. - edit_and_commit / create_pr replace the stack-setup boilerplate repeated across every scenario. - Add the missing Scenario 3 entry to the top-of-file index. Co-Authored-By: Claude Opus 4.8 <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
2 participants
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.