Agent skill · warpdotdev
resolve-merge-conflicts
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a
Reference it in any coding agent with:
@skills warpdotdev/resolve-merge-conflicts