skills.rest
KosmoCHE
KosmoCHECOMMUNITY
Explore all skills by this author →
WebsiteGitHub

merge

Merge feature branches into main with --no-ff merges and conflict reports.

Updated Aug 27, 2026
Search Tags:#git#workflow#merge#traceability#branch#version-control#no-ff
One-click install
npx skills add https://github.com/KosmoCHE/claude-plugins --skill merge-kosmoche
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/KosmoCHE/claude-plugins/tree/main/git-command/skills/merge
Command: npx skills add https://github.com/KosmoCHE/claude-plugins --skill merge-kosmoche

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Merges are often performed in a way that obscures individual commits or creates fast-forward histories. This Skill enforces a no-fast-forward merge strategy to preserve a clear, auditable commit history.

Core Features & Use Cases

  • Enforce --no-ff merges to create a dedicated merge commit, ensuring traceability.
  • Preserve all source-branch commits in history for auditability.
  • Detect and report merge conflicts without automatic resolution, guiding the user to resolve them.
  • Provide a repeatable, checklist-style workflow for merging branches into main.

Quick Start

Merge the current feature branch into main using --no-ff and verify that all commits remain visible in the history.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I merge a Git branch without losing commit history?▼

To merge a Git branch without losing commit history, use a no-fast-forward merge to create a dedicated merge commit. This preserves all source-branch commits, ensuring full traceability and auditability during feature integration.

Why does Git fast-forward my merge and how do I prevent it?▼

Git fast-forwards merges when the target branch has no new commits, erasing merge context. Prevent fast-forward merges by enforcing the --no-ff flag to generate a dedicated merge commit, maintaining a clear and auditable integration history.

What is the best way to detect merge conflicts before integrating a feature branch?▼

The best way to detect merge conflicts is using a workflow that checks working tree cleanliness before merging. This approach reports conflicts automatically without auto-resolving them, guiding you through manual resolution to ensure safe integration.

How do I maintain an auditable commit history during collaborative software development?▼

Maintain an auditable commit history by enforcing no-fast-forward merges during feature integration. This ensures every merge creates a dedicated commit, preserving individual source-branch commits for full traceability in collaborative version control.

Can I use this no-ff merge workflow if my working tree is not clean?▼

No, this merge workflow requires a clean working tree before integration. It detects uncommitted changes and reports them, preventing accidental overwrites and ensuring the feature branch merges safely into the main branch.

Related Skills

Explore More Software Engineering Skills→
open-haxopen-hax
6

git-safety-check

Check git branch, working tree, remotes, and submodules before destructive operations.

Official
Intermediate
mixomatmixomat

clean-gone-branches

Delete local git branches marked [gone] while skipping worktree branches.

Community
Intermediate
RyoMurakami1983RyoMurakami1983
2

git-initial-setup

Automates GitLab project and repository setup for streamlined onboarding and management.

Community
Intermediate
maggitmaggit

rebase

Plan and execute non-interactive git rebase operations with safety checks.

Community
Intermediate