git-merge

Merge a feature branch into main with safety checks and optional push.

Updated Jan 8, 2026

Search Tags:#automation #git #workflow #merge #feature-branch #main

Ready to run

npx skills add https://github.com/biwakonbu/cc-plugins --skill git-merge

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-merge
Source: https://github.com/biwakonbu/cc-plugins/tree/main/plugins/git-actions/skills/merge
Command: npx skills add https://github.com/biwakonbu/cc-plugins --skill git-merge

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill automates the end-to-end git merge workflow from a feature branch into main, including safety checks and optional push to remote.

Core Features & Use Cases

Safe, repeatable merge of feature branches into main with pre-merge validations.
Handles conflict awareness and requires explicit user confirmation before completing the merge.
Use Case: When collaborating on a feature, run this skill to merge the feature branch into main and push the result to the central repository.

Quick Start

Run the git-merge skill to merge your current feature branch into main and push the result after confirmation.

Frequently Asked Questions about git-merge

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

FAQPage Schema

How do I safely merge a feature branch into main without fast-forward?▼

To safely merge a feature branch into main, this skill automates the workflow using a no-fast-forward merge strategy, validates the working tree, and requires explicit user confirmation before completing the merge. It also guards against accidentally merging from main.

What is the best way to automate git merge workflows with conflict awareness?▼

Automating git merge workflows with conflict awareness requires pre-merge validations and explicit user confirmation before completing the merge. This skill targets collaborative Git workflows by enforcing working tree validation and pausing when conflicts are detected.

Can I automatically push to remote after merging a feature branch into main?▼

Yes, you can push to remote after merging a feature branch into main. This skill supports controlled push behavior and requires explicit user confirmation before completing the merge and pushing the result to the central repository.

Does this git merge automation enforce pre-merge safety checks on the working tree?▼

Yes, this git merge automation enforces pre-merge safety checks by validating the working tree before proceeding. It guards against merging from main, uses a no-fast-forward merge strategy, and requires explicit confirmation to complete the process.

When should I not use a no-fast-forward merge strategy for feature branches?▼

You should not use a no-fast-forward merge strategy if you want to keep the main branch history linear, as this approach preserves the feature branch commit topology. This skill enforces no-fast-forward merges to maintain a clear record of feature branch integrations.