majiayu000/claude-arsenal
xiaohongshu
xiaohongshu
286 148
View 
Finish Worktree Skill
finish-worktree
Completes feature branch work by rebasing, pushing, monitoring CI, and squash merging to main
SKILL.md
Full skill instructions
Finish Worktree Skill
CLAUDE: When this skill is invoked with /finish-worktree, immediately run:
./.claude/skills/finish-worktree.sh
Then guide the user through CI monitoring and merge-and-cleanup.
Purpose
Completes feature branch work with proper rebase, CI validation, and squash merge back to main.
Usage
/finish-worktree
Workflow Steps
Step 1: Rebase onto main
./.claude/skills/finish-worktree.sh
This script:
- Fetches latest from origin/main
- Rebases your branch onto main
- Runs local validation (fmt, architectural, clippy)
- Pushes with
--force-with-lease
Step 2: Monitor CI
Check GitHub Actions:
https://github.com/Async-IO/pierre_mcp_server/actions
Wait for all checks to pass (green).
Step 3: If CI Fails
Fix the issues locally, then:
# Make fixes
cargo fmt
cargo clippy --all-targets -- -D warnings -D clippy::all -D clippy::pedantic -D clippy::nursery
# Amend or add commit
git add .
git commit --amend --no-edit # or new commit
# Push again
git push --force-with-lease origin <branch-name>
Repeat until CI is green.
Step 4: Squash Merge and Cleanup
Once CI is green, run from the main worktree:
cd /path/to/main/worktree
./.claude/skills/merge-and-cleanup.sh
No arguments needed - branch info is saved by finish-worktree.sh.
This script:
- Pulls latest main
- Squash merges the feature branch
- Prompts for commit message
- Pushes main
- Removes the worktree
- Deletes the feature branch
Complete Example Session
# On feature branch in worktree
./.claude/skills/finish-worktree.sh
# Wait for CI...
# If red, fix and push again
# Once green, go to main worktree:
cd /path/to/main/worktree
./.claude/skills/merge-and-cleanup.sh
Related Skills
create-worktree- Creates worktree with environment setup
More skills from majiayu000
majiayu000/claude-arsenal
technical-spec
technical spec
286 141
View majiayu000/claude-arsenal
product-ux-expert
product ux expert
286 133
View majiayu000/claude-arsenal
database-patterns
database patterns
286 119
View majiayu000/claude-skill-registry
agent-task-conductor
Conduct multi-agent task orchestration and workflow coordination.
663 1
View majiayu000/claude-skill-registry
conductor-setup
Initialize project with Conductor artifacts (product definition,
663 1
View majiayu000/claude-skill-registry
animation-designer
Expert in web animations, transitions, and motion design using Framer Motion and CSS
663 1
View majiayu000/claude-skill-registry
diagramming
Creates Mermaid and ASCII diagrams for flowcharts, architecture, ERDs, state machines, mindmaps, and more. Use when user mentions diagram, flowchart, mermaid, ASCII diagram, text diagram, terminal diagram, visualize, C4, mindmap, architecture diagram, sequence diagram, ERD, or needs visual docume...
663 1
View majiayu000/claude-skill-registry-data
h3-pg
PostgreSQL bindings for H3 hexagonal grid system. Use when working with H3 cells in Postgres, including spatial indexing, geometry/geography integration, and raster analysis.
23 1
View majiayu000/claude-skill-registry
conductor-development
Context-Driven Development skill for projects using Conductor. Use this skill when you detect a `conductor/` directory in the project, when working on tasks defined in a `plan.md` file, or when the user asks about tracks, specs, or plans. Automatically applies TDD workflow, tracks task completion...
663 1
View majiayu000/claude-skill-registry
conductor-status
Display project status, active tracks, and next actions
663 1
View majiayu000/claude-skill-registry
dockerization
Official Stakpak application containerization standard operating procedure, a step-by-step guidline to properly dockerize applications. This is a rule book curated by the Stakpak Team.
663 1
View Popular AI tools
Video
Kaiber
Generate, edit, and beat-sync AI video with leading models in one workspace.
Paid
View Productivity
Vimcal
The world's fastest calendar for remote work
Free
View I
Images
IMGCreator.ai
Transform Your Design with AI Designer by ImgCreator.ai
Freemium
View Content & writing
Akool AI
Revolutionizing Video Production with AI-Powered Creativity
Paid
View Images
Clipdrop Uncrop
Extend an image past the frame and let AI fill the new aspect ratio.
Freemium
View Security
StarByFace
Discover your celebrity doppelgänger with StarByFace!
Free
View C
Finance
ChainClarity
ChainClarity explains 700+ crypto whitepapers in plain English, with layered summaries, comparisons, research tools, alerts, and a $4.99 Pro plan.
Freemium
View Coding & apps
Opus Clip
Opus.ai: Revolutionize Your Web Experience
Free
View