Repository navigation
docs(skills): upstream syncs check the files that merged cleanly - #515
Merged
Merged
Conversation
Sync checks only covered conflicted files, and fork CI never runs, so upstream tests asserting behaviour the fork changed and helpers the fork no longer calls merged cleanly and stayed broken across syncs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
adampeterhiggins
force-pushed
the
t3code/sync-skill-clean-merge-checks
branch
from
October 29, 2026 10:45
27156be to
7c7521e
Compare
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 sync skill only checked conflicted files, and fork CI never runs. That let files that merged cleanly break the fork without anything noticing:
ChatMarkdowntests broke because of fork PRs feat(web,mobile): tool calls show monochrome brand marks instead of favicon squares #480 and fix(web): context chips share one registry-owned hover preview #369.git mergeskips the pre-commit hook, so knip never saw them.origin/mainwere reported as "not caused by the merge" and carried into the next sync.The skill now:
vp run check:changedafter the merge commit.origin/mainin a follow-up PR stacked on the sync branch, like test(web): ChatMarkdown tests match the fork's link icons and chip labels #514, instead of accepting them as the baseline.No
pre-merge-commithook was added. That would change merge behaviour for everyone, not just syncs.Done with Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code