skills.rest
mdmagnuson-creator
mdmagnuson-creatorCOMMUNITY
Explore all skills by this author →
GitHub

merge-conflicts

Merge target branches into source branches and resolve pull request conflicts.

Updated Feb 20, 2026
Search Tags:#git#conflict-resolution#branch-management#pull-request#merge-conflicts#pr-workflow
One-click install
npx skills add https://github.com/mdmagnuson-creator/yo-go --skill merge-conflicts-mdmagnuson-creator
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-conflicts
Source: https://github.com/mdmagnuson-creator/yo-go/tree/main/skills/merge-conflicts
Command: npx skills add https://github.com/mdmagnuson-creator/yo-go --skill merge-conflicts-mdmagnuson-creator

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve merge conflicts on a pull request by merging the target branch into the source branch and fixing conflicts.

Core Features & Use Cases

  • End-to-end conflict resolution: Automates the core workflow of fetching, merging, and resolving conflicts across files.
  • Guardrails: Includes checks like warning on auto-commit settings and prompts for reviewer approval when necessary.
  • Use Case: When a PR has conflicts blocking merge, use this guide to bring the source branch up to date and complete the merge safely.

Quick Start

Provide the PR details (number or URL) to begin the end-to-end merge conflict resolution workflow.

Frequently Asked Questions about merge-conflicts

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

FAQPage Schema
How do I resolve merge conflicts on a pull request blocking my branch?▼

Resolve merge conflicts by merging the target branch into the source branch, fetching updates, fixing conflicting files, staging changes, and pushing to complete the PR merge safely.

What is the standard git workflow to fix branch conflicts before a PR merge?▼

The standard git workflow for fixing branch conflicts involves fetching target branch updates, merging into the source branch, resolving file conflicts, staging changes, and pushing updates to complete the PR safely.

Can I automatically update my source branch to fix PR conflicts across multiple files?▼

Yes, you can update a source branch to fix PR conflicts across multiple files by fetching the target branch, merging it into the source, and applying end-to-end conflict resolution across affected files before pushing.

Do I need to disable git auto-commit settings when resolving pull request conflicts?▼

You should review git auto-commit settings when resolving pull request conflicts. Guardrails warn on auto-commit configurations and prompt for reviewer approval to ensure changes are staged and pushed safely.

What are the limitations of automated git conflict resolution during a PR workflow?▼

Automated git conflict resolution during a PR workflow requires standard Git environments and prompts for reviewer approval when necessary. It handles fetching, merging, and pushing but relies on standard PR workflows to complete safely.

Related Skills

Explore More Software Engineering Skills→
CoolCoderSuperCoolCoderSuper
4

merge-into-branch

Merge an upstream branch into a Roslyn repository base branch.

Community
Advanced
arcasilesgrouparcasilesgroup
54

ai-pr

Automate governed pull request workflows with pre-push gates and squash merge.

Official
Advanced
kynetic-aikynetic-ai
1

pr

Create GitHub pull requests from in-progress work with branch and commit handling.

Official
Advanced
spyqsspyqs

update-nanoclaw

Synchronize a customized NanoClaw fork with upstream updates via merge, cherry-pick, or rebase.

Community
Advanced