Individual skill
resolve-conflicts
Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.
ai/skills/resolve-conflicts/SKILL.md
Source commit 3cad4d2f822842dcef94bdff2ef0d9fc45aea10d
What was checked
- Matches the observed repository HEAD
- Yes
- Scanner rules are current
- Yes
- Repository scan complete
- No
- Skill scan complete
- No
- Observed behavior
- Network or broad shell
- 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)
- 133
- Repository last updated
- Nov 6, 2026
- License
- Not available
Observed agent integration: No specific integration evidence. Standard SKILL.md installation does not imply verified compatibility.
- engineering Derived category
Files and excerpt
File metadata and permitted, redacted excerpts come from the recorded scan. Source links are pinned to that commit.
Browse files
SKILL.mdcore · 8,424 bytesSKILL.mdcore · 8,424 bytesSKILL.mdcore · 8,424 bytesSKILL.mdcore · 8,424 bytesSKILL.mdcore · 8,424 bytesscripts/categorize-conflicts.shruns · 2,946 bytesscripts/conflict-status.shruns · 2,158 bytesscripts/ensure-diff3-markers.shruns · 2,156 bytesscripts/test-categorize-conflicts.shruns · 5,278 bytesscripts/test-conflict-status.shruns · 7,697 bytesscripts/test-ensure-diff3-markers.shruns · 10,121 bytes
No licensed excerpt is available. You can inspect the pinned source.