merge

Merge origin/main into the current branch with guided conflict resolution.

Updated Aug 27, 2026

Search Tags:#git #workflow #collaboration #merge #conflict-resolution #branch-management #origin/main

Ready to run

npx skills add https://github.com/meganide/claude --skill merge-meganide

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/meganide/claude/tree/main/skills/merge
Command: npx skills add https://github.com/meganide/claude --skill merge-meganide

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill keeps your local branch up-to-date with origin/main and guides interactive resolution when conflicts arise, reducing manual guesswork during merges.

Core Features & Use Cases

Fetch and Merge: Retrieve the latest changes from origin/main and merge them into the current branch.
Interactive Conflict Guidance: When conflicts occur, present affected files with context and recommended resolutions.
Status & Reporting: After the merge, provide a concise summary of merged commits, incoming vs local changes, and any remaining conflicts.

Quick Start

Run git fetch origin main and git merge origin/main. If conflicts occur, follow the interactive guidance to resolve them.

Frequently Asked Questions about merge

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

FAQPage Schema

How do I sync my current branch with origin main?▼

To sync your current branch with origin main, you need to fetch the latest changes and merge them. This process retrieves remote updates and integrates them into your local working branch to keep it current.

How does guided conflict resolution work during a git merge?▼

Guided conflict resolution during a git merge presents affected files with context and recommended resolutions. It detects conflicts after an attempted merge and provides interactive guidance to help you resolve them without manual guesswork.

What is the best way to see incoming changes before merging origin main?▼

The best way to see incoming changes before merging origin main is using status and diff checks. Running git fetch followed by log and diff commands lets you review local and incoming updates before performing the actual merge.

Do I need any special git tools to handle branch management and merges?▼

You do not need special git tools to handle branch management and merges. Standard git commands like fetch, merge, and diff are sufficient to retrieve changes, perform merges, and receive interactive conflict resolution guidance.

Why does merging origin main into an active development branch cause conflicts?▼

Merging origin main into an active development branch causes conflicts when local changes overlap with incoming remote updates. Conflicts occur because git cannot automatically determine which modifications to keep when the same lines are edited.

What is included in the summary after I merge origin main into my local branch?▼

The summary after you merge origin main includes a concise report of merged commits, incoming versus local changes, and any remaining conflicts. This status update helps you verify what was integrated and what needs manual attention.