Merge a task branch into main with a linear history and verification.
npx skills add https://github.com/cowwoc/styler --skill git-merge-linear
Please help me install this Agent Skill. Skill: git-merge-linear Source: https://github.com/cowwoc/styler/tree/main/.claude/skills/git-merge-linear Command: npx skills add https://github.com/cowwoc/styler --skill git-merge-linear
Merging feature or task branches into main can often introduce messy merge commits, complicating the Git history and making debugging or future reverts harder. Ensuring a clean, linear history requires careful validation and specific Git commands that are easy to misuse. This Skill automates the process for a pristine main branch.
main), preventing common merge errors.--ff-only merge to guarantee a linear history, preventing unnecessary merge commits and keeping the commit graph clean.main, ensuring the merge was successful and as intended.main. This Skill ensures the merge is clean, linear, and validated, preventing accidental non-fast-forward merges or merging an un-squashed history, saving you from Git headaches.From the 'main' branch, use the git-merge-linear skill to merge the 'implement-formatter-api' task branch.
High-intent search queries and answers about installing and using this skill.
Fast-forward merge your task branch into main using `--ff-only` to preserve a linear history without merge commits. This Skill automates validation, executes the merge safely, and verifies the result remains clean and auditable.
Squash your feature branch into a single commit, then use fast-forward merge to integrate it into main. This Skill enforces one-commit prerequisites and validates linearity before and after merge, preventing accidental non-fast-forward merges.
Pre-merge verification confirms your task branch is ready—exactly one commit, current branch is main—then fast-forward merge executes, and post-merge validation confirms history linearity and correct commit addition to main.
Yes. This Skill automates the entire merge workflow: pre-merge checks, fast-forward merge execution, post-merge verification, and optional branch cleanup, ensuring clean history without manual Git command risks.
The Skill requires exactly one squashed commit per task branch before merge. If multiple commits exist, squash them first, then use this workflow to safely merge with linear history preserved.
WesleyMFrederickSquashes Git feature-branch history into a single commit when merging to main.
vince-winkintelManage GitLab merge requests for creation, review, approval, and merging.
SebasArenManage git worktrees for parallel branch development and merging.
nashgaoMerge pull requests into a target branch with validation and quality gates.