Merge jj bookmarks or git branches into main with rebase and CI checks.
npx skills add https://github.com/Cognitivemesh/pyarnes --skill branch-merge
Please help me install this Agent Skill. Skill: branch-merge Source: https://github.com/Cognitivemesh/pyarnes/tree/main/template/.claude/skills/branch-merge Command: npx skills add https://github.com/Cognitivemesh/pyarnes --skill branch-merge
Merges can be error-prone and time-consuming when coordinating feature branches and jj bookmarks with main. This skill automates a safe, deterministic merge flow that preserves working state, validates changes via pre-merge CI, and updates specs accordingly.
Run the safe-merge.sh script with the source ref to merge into main and observe pre-merge validation and post-merge specs.
High-intent search queries and answers about installing and using this skill.
To safely merge jj bookmarks into a git main branch, this skill automates a deterministic flow with status checks, rebase-forward logic, and a git fallback. It preserves working state while validating changes.
Automating pre-merge CI validation requires enforcing deterministic checks before integration. This skill applies pre-merge CI validation and optional test gates to ensure code health before safely merging feature branches into main.
Yes, this merge automation handles uncommitted work during a rebase by preserving your working state. It enforces a deterministic flow through status checks and rebase-forward logic to prevent data loss.
Yes, you can update specs and archive branches automatically after a git merge. This skill handles post-merge spec updates, archiving, and INDEX/Tier updates to keep branches and specs synchronized.
You should use a git fallback for branch merging when operating outside jj-managed repositories. This skill applies across both jj-managed repositories and standard Git workflows to ensure safe merges.
get-theo-aiAutomate jj version control workflows in colocated or Git-backed repositories.
ReinaMacCredyMerge origin/main into a local Git branch with guided conflict resolution.
alemdissoRun seven-checkpoint pre-merge code reviews with pass/warn/fail outputs.
bmsull560Resolves git rebase conflicts in feature branches via guided marker resolution.
