skills.rest
Async-IO
Async-IOOFFICIAL
Explore all skills by this author →
GitHub

finish-worktree

Rebase Git feature branches, run Cargo validation, and squash merge into main.

Updated Aug 23, 2026
Search Tags:#git#workflow#development#code review#merge#ci
One-click install
npx skills add https://github.com/Async-IO/pierre_mcp_server --skill finish-worktree
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: finish-worktree
Source: https://github.com/Async-IO/pierre_mcp_server/tree/main/.claude/skills/finish-worktree
Command: npx skills add https://github.com/Async-IO/pierre_mcp_server --skill finish-worktree

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill automates the complex and error-prone process of preparing a feature branch for merging, ensuring code quality and a clean project history.

Core Features & Use Cases

  • Automated Rebase: Rebases your feature branch onto the latest main branch, resolving conflicts locally.
  • Local Validation: Runs cargo fmt, architectural checks, and clippy to catch issues before pushing.
  • CI Monitoring Guidance: Pushes your branch and guides you on monitoring GitHub Actions.
  • Squash Merge & Cleanup: Facilitates a clean squash merge into main and removes the feature branch and worktree.
  • Use Case: After completing a new feature, invoke this skill to automatically rebase, validate, push, and then later squash merge it into the main branch, all while providing clear instructions for each step.

Quick Start

Run the finish worktree skill from your feature branch to begin the automated rebase and validation process.

Frequently Asked Questions about finish-worktree

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automate rebasing a Git feature branch onto main?▼

Automating a Git feature branch rebase involves updating your branch with the latest main changes and resolving conflicts locally. This skill initiates that process automatically, then runs local validation checks before pushing for CI monitoring.

What is the best way to run local validation checks before a Git merge?▼

Local validation before a Git merge requires running formatting and linting checks to catch issues early. This skill executes cargo fmt, architectural checks, and clippy automatically after rebasing to ensure code quality prior to pushing.

How do I squash merge a feature branch and clean up the worktree?▼

Squash merging and worktree cleanup involves condensing branch commits into main and removing the obsolete local files. This skill facilitates a clean squash merge into main and automatically removes the feature branch and worktree upon successful CI validation.

Do I need Cargo and shell scripting to automate Git branch completion?▼

Yes, Cargo and shell scripting capabilities are required for execution. This skill relies on Git, Cargo, and shell scripts to automate the rebase, validation, push, and squash merge workflow for your feature branches.

Can I monitor GitHub Actions CI status after pushing a feature branch?▼

Monitoring GitHub Actions CI status after pushing a feature branch is supported. This skill pushes your locally validated branch and provides clear instructions to guide you through monitoring the CI validation process.

Related Skills

Explore More Software Engineering Skills→
havingautismhavingautism
190

using-git-worktrees

Create isolated git worktrees for feature development.

Community
Intermediate
SeanHoggSeanHogg
3

merge-pr

Squash-merge GitHub pull requests with validation and cleanup.

Community
Advanced
dataroadincdataroadinc
1

testing

Run cargo test, fmt, and clippy checks on Rust projects.

Official
Intermediate
pwretmopwretmo

worktree-workflow

Automate git worktree setup, validation, commit, push, and PR creation via MCP.

Community
Advanced