Lightlines
Catalogue
Connect your agent
Sign in
Create account
Catalogue
›
Software engineering & architecture
fix-merge-conflicts
Task
michael-denyer
·
614 installs
Mirror of
cursor/fix-merge-conflicts
Install
Add
Get conflicting code back to a buildable state.
Overview
Files
History
Comments
About
About this skill
Visibility
Public
Repository
michael-denyer/pstack-claude
Language
English
License
MIT (from GitHub repository)
Created
Oct 16, 2026
Updated
Oct 16, 2026
Files
1