merge

Squash-merge successful session worktrees into the feature branch sequentially.

3|Updated Mar 25, 2026
One-click install
npx skills add https://github.com/willietran/autoboard --skill merge-willietran
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/willietran/autoboard/tree/main/skills/merge
Command: npx skills add https://github.com/willietran/autoboard --skill merge-willietran

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Consolidates multiple successful session worktrees into the feature branch in a controlled, auditable way, ensuring atomic commits and predictable history while preventing race conditions.

Core Features & Use Cases

  • Squash merge policy: One commit per session on the feature branch to keep history clean.
  • Sequential execution: Merge sessions one after another to avoid conflicts and race conditions.
  • Conflict resolution guidance: Provides auto-resolve strategies and step-by-step fallback when conflicts arise.
  • Worktree lifecycle management: Cleans up or preserves worktrees and branches according to success or failure of merges.

Quick Start

Run the merge skill to squash and merge each successful session onto the feature branch, in order, with conflict resolution rules applied.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I squash merge multiple git worktrees into a single feature branch?

To squash merge multiple git worktrees into a feature branch, sequential squash merges integrate each session as one atomic commit. This ensures clean history and deterministic integration while preventing race conditions across concurrent worktrees.

What is the best way to handle merge conflicts in a multi-session git workflow?

Handling merge conflicts in a multi-session git workflow uses auto-resolve strategies applied during sequential squash merges. A step-by-step fallback mechanism provides guidance when conflicts arise, ensuring deterministic integration of tracked worktrees.

Why does sequential merging prevent race conditions in orchestrated git workflows?

Sequential merging prevents race conditions in orchestrated git workflows by integrating session worktrees one after another instead of concurrently. This ordered execution avoids overlapping conflicts and ensures each merge updates tracking deterministically.

How do I manage worktree lifecycle after a successful squash merge?

To manage worktree lifecycle after a successful squash merge, the workflow cleans up or preserves worktrees and branches based on merge success or failure. This ensures tracking accurately reflects the integrated feature branch state.

Can I integrate multiple successful sessions into one commit per session?

Yes, you can integrate multiple successful sessions into one commit per session using an enforced squash-merge policy. This consolidates tracked worktree changes into the feature branch with clean, auditable, and predictable history.