Resolve Git Conflicts
Claude skill for Resolve Git Conflicts
LLM Evaluation
Evaluated by: xiaomi/mimo-v2-flash:free
Last evaluated: March 29, 2026
Prompt Preview
---
name: resolve-git-conflicts
description: >
Resolve merge and rebase conflicts with safe recovery strategies.
Covers identifying conflict sources, reading conflict markers,
choosing resolution strategies, and continuing or aborting operations
safely. Use when a git merge, rebase, cherry-pick, or stash pop reports
conflicts, when a git pull results in conflicting changes, or when you
need to safely abort and restart a failed merge or rebase operation.
license: MIT
allowed...
Full prompt length: 7575 characters