From 4ba0026aa1ef907e37dd8dc8d9fde9ec0fe01c8f Mon Sep 17 00:00:00 2001
From: gsxdsm <eclipxe@gmail.com>
Date: Wed, 18 Feb 2026 19:31:09 -0800
Subject: [PATCH] feat: Add conflict resolution event types

---
 libs/types/src/event.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/types/src/event.ts b/libs/types/src/event.ts
index 8dfb5a15..1d1afb47 100644
--- a/libs/types/src/event.ts
+++ b/libs/types/src/event.ts
@@ -75,6 +75,8 @@ export type EventType =
   | 'merge:success'
   | 'merge:conflict'
   | 'merge:error'
+  | 'conflict:aborted'
+  | 'conflict:resolved'
   | 'branchCommitLog:start'
   | 'branchCommitLog:progress'
   | 'branchCommitLog:done'