add Claude Code skill: merge-v1-to-main - #1378
Merged
Merged
Conversation
Documents the repeatable process for porting v1 CLI changes to main via `git merge origin/v1`, including the conflict patterns that arise from the launchable/ → smart_tests/ rename and v1/main Java API differences. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
Author
gayanW
approved these changes
Sep 4, 2026
gayanW
left a comment
gayanW
left a comment
Contributor
There was a problem hiding this comment.
LGTM. Will try it next time.
Merged
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
3 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.
Why
Merging v1 into main involves recurring conflict patterns (token renames, Python path renames, Java API differences, jar rebuild). Without a documented procedure, each merge risks introducing subtle bugs or requiring the same problem-solving from scratch.
What
Adds
.claude/skills/merge-v1-to-main/SKILL.md— a Claude Code skill that documents the step-by-step process forgit merge origin/v1into main, including:deleted by us,both modifiedfor tests/Java/jar)Once merged, Claude Code will automatically load this skill when asked to "merge v1 to main" or similar.