git-workflow

Manage feature development with isolated git worktrees and atomic commits.

66|3|Updated Jan 31, 2026
One-click install
npx skills add https://github.com/lgbarn/shipyard --skill git-workflow-lgbarn
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/lgbarn/shipyard/tree/main/skills/git-workflow
Command: npx skills add https://github.com/lgbarn/shipyard --skill git-workflow-lgbarn

SYSTEM DOCUMENTATION & REQUIREMENTS

## What problem does it solve? This skill streamlines feature development by enabling isolated workspaces and atomic commits, reducing context switching and integration risk.

## Core Features & Use Cases

  • Isolated Worktrees: Create and manage dedicated worktrees to keep features separate from the main branch.
  • Atomic Commits & Branch Completion: Ensure small, testable changes and a clear path to merge, PR, or discard the feature branch.
  • Guided Safety & Workflow: Enforces directory-priority rules, ignore verification, automatic project setup, baseline testing, and a standardized completion menu.

### Quick Start Start a new feature with: /shipyard:worktree create feat-branch. Then follow prompts to set up, run tests, and finish with one of four completion options.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I isolate feature development with git worktrees?

To isolate feature development with git worktrees, you can create dedicated worktrees that keep branches separate from your main directory, reducing context switching and integration risk during development.

What is the best way to manage atomic commits in a feature branch?

Managing atomic commits in a feature branch involves enforcing small, testable changes and following a standardized completion menu to merge, PR, preserve, or discard the development branch safely.

How do I safely complete and merge a git feature branch?

To safely complete and merge a git feature branch, follow a guided workflow that verifies ignore rules, runs test baselines, and offers four completion options: merge, PR, preserve, or discard.

Does git worktree workflow support automatic project setup and test baselines?

Yes, git worktree workflows support automatic project setup and test baselines by enforcing directory priority rules and deterministic configuration checks before you begin feature development.

Why should I use git worktrees instead of standard branching for feature development?

Git worktrees provide isolated workspaces for each feature, unlike standard branching, reducing context switching and integration risk by keeping separate directories and enforcing standardized completion flows.

When should I discard or preserve a git worktree branch?

You should discard or preserve a git worktree branch when ending a development flow, using the standardized four-option completion menu to safely remove the worktree or keep it for future work.