Git Conflict Review
Predicts merge conflicts without touching your working tree.
About
A skill that simulates a merge between two branches in memory (or a throwaway worktree on older git) and reports each conflicting file, its conflict type, and a risk-ranked resolution order.
Diagnosis stays strictly read-only — nothing in your working tree, index, or refs is modified. It pairs with sibling skills for guided resolution and PR merging, and needs git 2.38+ for the in-memory path.
What it can do
- In-memory merge simulation
- Conflict file reporting
- Conflict type classification
- Risk-ranked resolution order
- Read-only diagnosis
- Severity heuristics for common layouts
Setup
- Run the install command to add the skill for your agents.
- Start a fresh agent session.
- Ask it to predict conflicts between two branches.
Prerequisites
git 2.38+ recommended (older git uses a worktree fallback).
Use cases
Works with
Trust score — 4/10
Scored 4/10 (metrics tier, metrics-v1). Evidence: 0 stars, 3 commits — brand new; read-only diagnosis, never touches working tree; in-memory merge needs git 2.38+. License: MIT.
★ 0 GitHub stars
How the trust score is built
Full methodology →- Adoption · stars/downloads, log-scaled vs peers
- 3.0/10
- Maintenance · recency, releases, issue load
- 4.0/10
- Openness · license + docs
- 8.0/10
- Manual review · sanity read + red-flag check
- 5.0/10
- · 0 stars, 3 commits — brand new
- · read-only diagnosis, never touches working tree
- · in-memory merge needs git 2.38+
Sources
Every fact above was checked against these sources. Where a claim comes from the provider and couldn't be independently verified, the text says so.