Menu

Individual skill

git-conflict-resolver

0upvotes

Resolves complex git rebase and merge conflicts with AST-level context, preserving intent across concurrent branches.

skills/productivity/git-conflict-resolver/SKILL.md

Read pinned source

Source commit d0a9928d24afb7df0fad2f2f35f65d3938a6926a

What was checked

Matches the observed repository HEAD
Yes
Scanner rules are current
No
Repository scan complete
No
Skill scan complete
Yes
Observed behavior
Not checked yet
Last checked
Nov 5, 2026

These are observations at the recorded commit, not a guarantee of safety. Review the source before running it.

Install this skill

Choose an agent in your Stack or copy a command below. Commands fetch the pinned commit and copy only this skill directory. Existing destinations are refused. Copying a command does not install anything.

An install command is unavailable: current rules, complete repository and skill scans, an eligible behavior level and a permitted license are required.

Repository context

Repository stars (not skill ratings)
27
Repository last updated
Aug 20, 2026
License
MIT

Observed agent integration: No specific integration evidence. Standard SKILL.md installation does not imply verified compatibility.

Files and excerpt

File metadata and permitted, redacted excerpts come from the recorded scan. Source links are pinned to that commit.

Browse files
Read excerpt

## Purpose

Resolve difficult, tangled Git merge and rebase conflicts by analyzing both branches' underlying intent, syntax AST changes, import reorganizations, and semantic context rather than blindly picking incoming vs current changes.

## When to Use

- Resolving massive merge conflicts after rebasing a long-lived feature branch onto main.
- Reconciling concurrent refactorings (e.g. one branch renamed a function, another branch added new calls to it).
- Fixing lockfile conflicts (`pnpm-lock.yaml`, `package-lock.json`, `Cargo.lock`).

## What to Analyze

1. **Branch Intent Analysis**: What did Branch A (Incoming) change and why? What did Branch B (Current) change and why?
2. **Syntactic Merging**: Harmonizing import statements, exports, and interface definitions from both branches.
Back to top