git-merge-expert-worktree

Automate isolated git worktree merge workflows with lifecycle steps.

13|Updated Mar 15, 2026
One-click install
npx skills add https://github.com/ulpi-io/browse --skill git-merge-expert-worktree
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-merge-expert-worktree
Source: https://github.com/ulpi-io/browse/tree/main/.agents/skills/git-merge-expert-worktree
Command: npx skills add https://github.com/ulpi-io/browse --skill git-merge-expert-worktree

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Enables safe, isolated git worktree merges by performing all operations in disposable worktrees, ensuring the main working tree remains untouched and stable during complex integration tasks.

Core Features & Use Cases

  • Worktree lifecycle orchestration: DISCOVER, CREATE, SETUP, WORK, MERGE, VALIDATE, CLEANUP to manage multi-step merge sessions.
  • Isolated merges in disposable worktrees: perform conflict resolution without affecting the main branch.
  • Worktree path conventions and monorepo setup: uses .claude/worktrees/<name> with session branches like worktree-<name>, and optional symlinks for node_modules and env propagation.
  • Parallel worktree operations for batch merges: create multiple worktrees in parallel for concurrent integrations.
  • Conflict resolution in isolation: resolve conflicts in the worktree context with safe abort/recreate patterns.

Quick Start

Create a dedicated worktree session for a target merge, perform the merge in isolation, then validate and clean up.

Frequently Asked Questions about git-merge-expert-worktree

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

FAQPage Schema
How do I perform a git merge without affecting my main working tree?

Git worktree merge isolation performs all operations in a separate worktree directory, ensuring the main working tree remains untouched and stable during complex integration tasks and conflict resolution.

What is the best way to handle multi-branch merges in a monorepo?

Parallel worktree operations enable concurrent batch merges for monorepos by creating multiple disposable worktrees simultaneously, keeping the main branch stable while managing separate session branch integrations.

How do I resolve git merge conflicts in isolation?

Isolated conflict resolution uses disposable worktrees to handle merge conflicts safely, providing safe abort and recreate patterns to manage conflicts without risking the main working tree state.

Does git worktree workflow support node_modules and environment propagation?

Git worktree workflows support node_modules and environment propagation by utilizing optional symlinks during monorepo setup, ensuring disposable worktrees have access to necessary dependencies for merge validation.

Can I run batch worktree operations concurrently for multiple branch integrations?

Batch worktree operations support creating multiple worktrees in parallel for concurrent integrations, enabling simultaneous multi-branch merges while maintaining strict lifecycle steps from discovery to cleanup.

What are the limitations of using disposable worktrees for git merges?

Disposable worktree merges require strict lifecycle management, following precise discovery, setup, work, validation, and cleanup steps to guarantee safe abort and recreate patterns without leaving residual files.