Can I specify which branches to merge?

Absolutely. The skill uses variables for TO_BRANCH and FROM_BRANCH, allowing you to define the source and target for every merge operation.

Does it create a merge commit?

Yes, it uses the --no-ff flag by default to ensure a merge commit is created, which makes it easier to track when feature branches were integrated into the main codebase.

Does this skill handle merge conflicts?

Yes, it identifies conflicts and provides a workflow to resolve them, including integration with specialized conflict resolution tools if necessary.

What happens if my working tree is not clean?

The skill includes a validation step to check for uncommitted changes and will prompt you to clean your working tree before proceeding to prevent data loss.

Why does it merge from the remote tracking branch instead of local?

Merging from origin ensures that only code that has been committed and pushed is integrated, which prevents accidental inclusion of local work-in-progress or uncommitted changes.

Git Branch Merger

Name: Git Branch Merger
Author: duc01226

byduc01226

•

开发者工具

Automates safe branch merging with remote synchronization, conflict resolution, and verification steps.

The git-merge skill provides a robust framework for merging code between branches while minimizing the risk of merge conflicts and data loss. It automatically handles remote state synchronization, enforces clean working tree checks, and utilizes a non-fast-forward merge strategy to maintain a clear commit history. Whether you are merging features into main or keeping branches up to date, this skill ensures a disciplined workflow with mandatory safety confirmations, remote-first merging to avoid local work-in-progress errors, and integrated conflict management.

主要功能

01Non-fast-forward merge strategy to preserve project history

026 GitHub stars

03Automated remote synchronization (fetch/pull) to prevent stale merges

04Remote-tracking branch priority to ensure only committed code is merged

05Pre-merge validation of working tree status to ensure safety

06Integrated conflict resolution workflow and guidance

使用场景

01Synchronizing a local development branch with the latest remote changes

02Merging a completed feature branch into the main production branch

03Standardizing merge procedures across teams to ensure commit history consistency

主要功能

01Non-fast-forward merge strategy to preserve project history

026 GitHub stars

03Automated remote synchronization (fetch/pull) to prevent stale merges

04Remote-tracking branch priority to ensure only committed code is merged

05Pre-merge validation of working tree status to ensure safety

06Integrated conflict resolution workflow and guidance

使用场景

01Synchronizing a local development branch with the latest remote changes

02Merging a completed feature branch into the main production branch

03Standardizing merge procedures across teams to ensure commit history consistency