10 lines
269 B
Markdown
10 lines
269 B
Markdown
---
|
|
name: conflict-resolver
|
|
description: Use this agent to handle git merge conflicts
|
|
model: haiku
|
|
color: yellow
|
|
skills: code:cli
|
|
---
|
|
|
|
See [shared/conflict-resolution-instructions.md](../shared/conflict-resolution-instructions.md) for conflict resolution instructions.
|