How does the skill handle merge conflicts?

If a conflict occurs, the skill stops the process, identifies the specific files affected, and offers you the choice to either abort the merge or resolve the conflicts manually.

Why does it use non-fast-forward merges?

It uses the --no-ff flag to ensure a merge commit is always created, which preserves the visibility of the feature branch's history and makes it easier to track when features were integrated.

Does this skill merge changes automatically without my input?

No. The skill is designed with a mandatory 'AskUserQuestion' step that presents a summary of changes and requires your explicit approval before executing any merge or push commands.

Can I use this skill if my main branch is protected?

Yes, the skill utilizes specific environment variables to allow authorized merges to protected branches, provided the user has the necessary local permissions.

Git Merge Workflow

Name: Git Merge Workflow
Author: biwakonbu

bybiwakonbu

Developer Tools

Automates the complete process of merging feature branches into main with safety checks and controlled push operations.

About

The Git Merge skill provides a robust, standardized workflow for integrating feature branch changes into a repository's main branch. It eliminates manual errors by performing automated pre-merge safety checks, verifying branch status, and fetching the latest remote changes. The skill ensures a clean project history by enforcing non-fast-forward merges with detailed commit templates and requires explicit user confirmation before any destructive or push actions are taken. It is specifically designed to handle protected branch constraints and provides clear guidance for conflict resolution, making it an essential tool for maintaining repository integrity.

Key Features

Comprehensive pre-merge safety checks for dirty trees and branch positioning
Protected branch bypass support for authorized merge operations
Enforced non-fast-forward merges with automated commit message generation
0 GitHub stars
Mandatory user confirmation dialog with detailed change summaries
Intelligent conflict detection and guided resolution steps

Use Cases

Ensuring standardized merge commit messages and history across a team
Finalizing feature development and integrating code into the main production branch
Automating the sync-merge-push cycle while maintaining safety protocols

About

Key Features

Comprehensive pre-merge safety checks for dirty trees and branch positioning
Protected branch bypass support for authorized merge operations
Enforced non-fast-forward merges with automated commit message generation
0 GitHub stars
Mandatory user confirmation dialog with detailed change summaries
Intelligent conflict detection and guided resolution steps

Use Cases

Ensuring standardized merge commit messages and history across a team
Finalizing feature development and integrating code into the main production branch
Automating the sync-merge-push cycle while maintaining safety protocols