skills.rest
LPdsgn
LPdsgnCOMMUNITY
Explore all skills by this author →
GitHub

integration

Coordinate git worktree integration with conflict resolution and rollback planning.

Updated Aug 23, 2026
Search Tags:#automation#git#planning#worktrees#integration#CI#merge-conflicts
One-click install
npx skills add https://github.com/LPdsgn/claude-toolkit --skill integration-lpdsgn
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: integration
Source: https://github.com/LPdsgn/claude-toolkit/tree/main/plugins/dev-tools/skills/integration
Command: npx skills add https://github.com/LPdsgn/claude-toolkit --skill integration-lpdsgn

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Manage integration of multiple git worktrees, coordinating conflict resolution, testing, and merge into the main branch.

Core Features & Use Cases

  • Conflict prediction and resolution planning
  • Pre-integration assessment across worktrees
  • Targeted integration planning and execution
  • Interactive input modes: all, numbers, names, or plan file
  • Integration reporting and rollback capabilities

Quick Start

Use the integration skill to coordinate merging worktrees by numbers, names, or an integration plan file. Examples: /integration all, /integration 1,2,3, or /integration integration-plan.md. Start in interactive mode by omitting arguments.

Frequently Asked Questions about integration

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

FAQPage Schema
How do I manage merge-conflicts when integrating multiple git worktrees into a main branch?▼

Git worktree integration is coordinated by automating merge order, predicting conflicts, and validating readiness before execution. This skill manages merging multiple worktrees into main while handling conflict resolution and providing rollback strategies.

What is the best way to automate concurrent feature work merges across multiple worktrees?▼

Automating concurrent feature work merges is best handled through plan-driven execution that assesses worktree readiness and generates targeted integration plans. You can execute merges interactively by specifying all worktrees, specific numbers, names, or using a plan file.

How does pre-integration assessment work for git worktrees before merging into main?▼

Pre-integration assessment works by performing readiness checks across worktrees to predict merge-conflicts before execution. It evaluates the state of concurrent feature work and generates an integration report to determine if branches are ready to merge into main.

Can I use an integration plan file to coordinate git worktree merges?▼

Yes, you can use an integration plan file to coordinate git worktree merges by passing it as an argument. The skill reads the plan file to drive execution, applying the specified merge order, readiness checks, and conflict resolution strategies automatically.

What happens if a worktree integration fails during the merge into main?▼

If a worktree integration fails during the merge into main, the skill provides rollback strategies to revert the changes. It also generates an integration report detailing the execution state, allowing you to identify which worktree caused the failure.

Related Skills

Explore More Software Engineering Skills→
xenitV1xenitV1
230

git-worktrees

Create isolated Git worktrees with safety checks and directory selection.

Community
Intermediate
blakesimsblakesims

review-merge

Validate feature branch merge readiness with integration checks and summaries.

Community
Advanced
AndyHsuTWAndyHsuTW

django-verification

Automate Django project verification with linters, security scanners, and tests.

Community
Advanced
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate