Merge origin/main into the current branch with guided conflict resolution.
npx skills add https://github.com/meganide/claude --skill merge-meganide
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
This Skill keeps your local branch up-to-date with origin/main and guides interactive resolution when conflicts arise, reducing manual guesswork during merges.
Run git fetch origin main and git merge origin/main. If conflicts occur, follow the interactive guidance to resolve them.
High-intent search queries and answers about installing and using this skill.
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.
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.
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.
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.
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.
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.
mixomatDelete local git branches marked [gone] while skipping worktree branches.
BedaBeda-GrowthDetect uncommitted changes in local Git branches and push them to remote.
cowwocMerge a task branch into its base with a linear fast-forward history.
Knuckles-TeamAutomate Git history fixes using rebase, cherry-pick, and bisect workflows.
