skills.rest
mjun0812
mjun0812COMMUNITY
Explore all skills by this author →
Website𝕏@mjun0812GitHub

git-fix-conflict

Detect and resolve Git conflicts from merge, rebase, cherry-pick, revert, and PR operations.

1|Updated Aug 24, 2026
Search Tags:#git#pull request#github#merge conflict#rebase#conflict resolution#cherry-pick
One-click install
npx skills add https://github.com/mjun0812/skills --skill git-fix-conflict-mjun0812
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-fix-conflict
Source: https://github.com/mjun0812/skills/tree/main/skills/git/git-fix-conflict
Command: npx skills add https://github.com/mjun0812/skills --skill git-fix-conflict-mjun0812

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve? Merge, rebase, cherry-pick, and PR conflicts interrupt development flow and require careful manual analysis of both sides of each conflicted file. This Skill automates the detection, analysis, and resolution of Git conflicts while preserving the intent of both changes. ## Core Features & Use Cases - Conflict Detection and Resolution: Identifies unresolved files via git diff --name-only --diff-filter=U, analyzes both sides of each conflict marker, and applies a reasoned resolution. - Multi-Operation Support: Continues in-progress merge, rebase, cherry-pick, revert, apply, and am operations, and can start a merge when a GitHub PR reports CONFLICTING. - Dry-Run Mode: The --dry-run flag lists conflicted files and proposes a resolution plan without editing files, staging, committing, or pushing. - Use Case: A teammate's PR shows merge conflicts with the base branch. Invoke this Skill to fetch the base branch, resolve each conflicted file, run the test suite, and push the resolved branch. ## Quick Start Resolve the merge conflicts on my current branch and push the result.

Frequently Asked Questions about git-fix-conflict

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

FAQPage Schema
How do I resolve Git merge conflicts automatically?▼

Invoke this Skill on the conflicted branch and it detects unresolved files with git diff, analyzes both sides of each conflict marker, applies a resolution, stages the files, and creates the merge commit. It also runs the repository's tests to verify the resolution.

How to fix a conflicting GitHub pull request?▼

When a PR reports mergeable status CONFLICTING, the Skill fetches the base branch, starts a merge with git merge origin/<base-branch>, resolves each conflicted file, and pushes the result back to the PR branch.

Can I preview conflict resolutions without changing files?▼

Yes, pass the --dry-run flag to get a list of conflicted files and a proposed resolution plan without editing files, staging, committing, or pushing. For PR conflicts it uses git merge-tree for non-destructive detection.

Does it work during a rebase or cherry-pick in progress?▼

Yes, it continues in-progress rebase, cherry-pick, revert, apply, and am operations by resolving conflicts and running the appropriate --continue command. It never starts a new rebase on its own.

Will it force-push after rewriting history?▼

Only after explicit user confirmation. When history has been rewritten by a rebase, it asks before pushing and uses --force-with-lease instead of --force to avoid overwriting others' work.

Related Skills

Explore More Software Engineering Skills→
muklesmukles

git-commit

Create a conventional git commit from staged or unstaged changes.

Community
Advanced
Advance-Technologies-FoundationAdvance-Technologies-Foundation
55

pr-delivery-flow

Automate GitHub pull request delivery from branch updates to merging.

Official
Advanced
kriscendobotkriscendobot
3

conflict-resolution

Resolve git merge and rebase conflicts by analyzing semantic intent of both branches.

Community
Advanced
awfixers-stuffawfixers-stuff

git-rebase-sync

Rebase local feature branches onto the latest origin base with conflict handling.

Official
Advanced