skills.rest
GobbyAI
GobbyAIOFFICIAL
Explore all skills by this author →
WebsiteGitHub

merge

Automate Git merge conflict resolution across worktrees and branches.

19|3|Updated Dec 15, 2025
Search Tags:#automation#git#ai#worktree#merge#conflicts
One-click install
npx skills add https://github.com/GobbyAI/gobby --skill merge-gobbyai
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/GobbyAI/gobby/tree/main/src/gobby/install/shared/skills/merge
Command: npx skills add https://github.com/GobbyAI/gobby --skill merge-gobbyai

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill enables AI-assisted management of Git merge operations, streamlining conflict resolution across branches and worktrees to reduce manual effort and errors.

Core Features & Use Cases

  • Start merges: Initiate a merge across a worktree and source branch with automatic AI-guided conflict resolution.
  • Monitor progress: Check resolution status, conflicts, and progress through a unified interface.
  • Resolve & apply: Resolve conflicts (AI-assisted or manual) and apply the final merge, with support for aborting if needed.
  • Use Case: A feature branch must be integrated into main across multiple worktrees; the skill orchestrates the merge, resolves conflicts, and completes the merge with a single command flow.

Quick Start

Use the /gobby merge start <worktree-id> <source-branch> to begin. Retrieve status with /gobby merge status <resolution-id>. Resolve conflicts via /gobby merge resolve <conflict-id> or allow AI with default settings. Apply the merge with /gobby merge apply <resolution-id>. Abort an in-progress merge with /gobby merge abort <resolution-id>.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I automate Git merge conflict resolution across worktrees?▼

Git merge conflict resolution can be automated by initiating a merge with the start command, using AI strategies to resolve conflicts, and applying the final merge. This streamlines integration across multiple worktrees and branches.

Can I monitor the progress of an ongoing Git merge?▼

You can monitor an ongoing Git merge by checking the resolution status. The status command provides updates on resolution progress, active conflicts, and the current state of the merge operation.

Does AI merge resolution support manual overrides?▼

AI merge resolution supports manual overrides. Users can manually resolve specific conflicts using the resolve command or allow the AI to handle them with default tiered strategies.

How do I abort an in-progress Git merge operation?▼

To abort an in-progress Git merge operation, use the abort command with the specific resolution identifier. This stops the process and safely cancels the ongoing conflict resolution and merge.

What is the best way to integrate a feature branch into main using AI?▼

The best way to integrate a feature branch into main using AI is to start a merge, let the AI resolve conflicts automatically, and apply the final merge. This orchestrates the entire workflow with a single command flow.

Related Skills

Explore More Software Engineering Skills→
lestrratlestrrat
2

git-detect-merged

Detect local branches and worktrees merged into a target branch.

Community
Advanced
heman1033p-createheman1033p-create

merged

Switch to main, pull latest, and delete merged feature branches.

Community
Intermediate
HCMUTE-RTICHCMUTE-RTIC

mcp-server-skills

Build MCP servers with Next.js, mcp-handler, and shared Zod schemas.

Official
Intermediate
FutureAtomsFutureAtoms
1

git-github-conflict-resolve

Guide Git merge conflict resolution with Git and gh commands.

Community
Intermediate