Repository navigation
ci(fork-release): Claude resolves upstream merge conflicts for the build - #5
Merged
Merged
Conversation
The hourly fork release failed whenever upstream no longer merged cleanly into collin/main. Now fork/resolve-conflicts.sh has Claude Code resolve the conflicted files (and nothing else), the result is cached per fork/upstream pair so retries cost nothing, and prepare hands the exact merge commit to the typecheck and build jobs as a bundle instead of each re-merging. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
github-actions
Bot
added
vouch:trusted
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…solution Co-Authored-By: Claude Opus 5.5 <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
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.
The hourly Fork release failed whenever upstream no longer merged cleanly into
collin/main(latest:KeybindingsSettings.logic.ts, run 39649857765).fork/resolve-conflicts.sh: Claude Code (Opus, max $5/run) resolves only the conflicted files; the script rejects edits outside them and leftover markers, then commits.force.collin/mainis not touched (GITHUB_TOKEN can't push upstream workflow changes); the daily T3 task still syncs it via PR.ANTHROPIC_API_KEYorCLAUDE_CODE_OAUTH_TOKEN; without one, a conflict fails as before.Proof: reproduced the failing pair (fork 9c252cb + upstream 680152e) locally; the script resolved it correctly (kept fork dictate labels + upstream's renamed queue label). Bundle fetch tested incl. Windows paths.
🤖 Generated with Claude Code