Initial commit

2025-11-30 08:41:01 +08:00
commit 3b4f3145ad
13 changed files with 299 additions and 0 deletions
--- a/agents/conflict-resolver.md
+++ b/agents/conflict-resolver.md
@@ -0,0 +1,9 @@
+---
+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.