What happens if the fast-forward merge fails?

If the merge fails (usually because the main branch has moved forward), the skill provides explicit instructions to rebase the task branch onto the latest main.

Why does the skill require exactly one commit?

Requiring a single squashed commit ensures that the main branch history remains clean and that each feature or fix is represented as an atomic change.

How does the optimized script improve performance?

The optimized script bundles multiple validation and execution steps into a single execution block, reducing LLM round-trips from 8 down to 2-3.

Does this skill automatically delete my work?

No, branch and worktree cleanup is optional. The manual workflow prompts for confirmation, while the optimized script uses a flag to ensure intentionality.

Git Linear Merge

Name: Git Linear Merge
Author: cowwoc

bycowwoc

•

Developer Tools

Maintains a clean, linear Git history by automating fast-forward merges with built-in pre- and post-merge validation.

The Git Linear Merge skill automates the process of merging task branches into the main branch while ensuring a strictly linear history. It enforces industry best practices such as requiring a single squashed commit and performing rigorous validation checks before and after the merge. By utilizing fast-forward-only merges, it prevents clutter from merge commits, making it ideal for teams following trunk-based development or clean history protocols. The skill also includes an optimized batch script that reduces LLM round-trips by 86%, providing near-instant execution for simple merges while maintaining all safety checks.

Key Features

013 GitHub stars

02Provides automated pre-merge validation of branch states and commit counts

03Includes an optimized script that reduces execution time by up to 86%

04Mandates single-commit task branches to ensure atomic and clean commit logs

05Automates post-merge cleanup of local branches and associated Git worktrees

06Enforces fast-forward-only merges to prevent non-linear history and merge commits

Use Cases

01Merging a reviewed feature branch into the main branch while maintaining a clean history

02Automating trunk-based development workflows where merge commits are strictly prohibited

03Speeding up the final stage of the development lifecycle with optimized, low-latency merge scripts

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cowwoc/styler git-merge-linear

For use in Claude.ai and ChatGPT

Download Skill