merge

Squash merge feature branches into develop or main with Git worktrees.

Updated Aug 27, 2026
One-click install
npx skills add https://github.com/Piece-Puzzly/Piece-iOS --skill merge-piece-puzzly
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/Piece-Puzzly/Piece-iOS/tree/main/.claude/skills/merge
Command: npx skills add https://github.com/Piece-Puzzly/Piece-iOS --skill merge-piece-puzzly

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill automates the process of merging feature branches into the main development branch using a squash merge strategy, ensuring a clean and organized commit history.

Core Features & Use Cases

  • Automated Squash Merging: Consolidates all commits from a feature branch into a single commit on the target branch.
  • Worktree Support: Seamlessly operates in both standard Git environments and Git worktree setups.
  • Intelligent Target Branch Selection: Automatically merges into develop if it exists, otherwise merges into main.
  • Use Case: After completing a new feature, you can use this Skill to merge it into develop with a single, descriptive commit message, keeping your repository history clean.

Quick Start

Use the merge skill to squash merge the current feature branch into the develop branch.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I squash merge a feature branch into main?

To squash merge a feature branch, this Skill consolidates all commits into a single commit on the target branch. It automatically selects the develop branch if it exists, otherwise defaulting to main.

Does squash merging work with Git worktree setups?

Yes, squash merging works seamlessly with Git worktree setups. The Skill detects your worktree environment and provides specific guidance for conflict resolution and worktree cleanup after the merge.

How do I generate a commit message for a squash merge?

You can generate a commit message for a squash merge automatically. The Skill analyzes your feature branch name to create a concise, descriptive commit message for the target branch history.

What happens if I have uncommitted changes before a squash merge?

If uncommitted changes exist before a squash merge, the Skill aborts the operation. It performs pre-merge checks to ensure your working directory is clean before integrating the feature branch.

What is the best way to automate merging feature branches in Git?

The best way to automate merging feature branches is using a Skill that handles squash merging, target branch selection, and remote push operations. This ensures a clean repository history without manual commit squashing.

Can I automatically push squash merged branches to a remote repository?

Yes, you can automatically push squash merged branches to a remote repository. The Skill manages the push operations to your remote repositories immediately after completing the local squash merge.