From a1a4d4d8013487ea9ae48e8b4fef10097fa76a4d Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bensima.com>
Date: Sat, 22 Nov 2025 16:12:33 -0500
Subject: feat: implement t-1o2bxcq7999.1

---
 Omni/Ide/hooks/post-checkout | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Omni/Ide/hooks/post-checkout')

diff --git a/Omni/Ide/hooks/post-checkout b/Omni/Ide/hooks/post-checkout
index 3fe14b5..7c8bcb9 100755
--- a/Omni/Ide/hooks/post-checkout
+++ b/Omni/Ide/hooks/post-checkout
@@ -15,6 +15,10 @@ then
     MakeTags "${changed[@]}"
 fi
 
+# Configure git merge driver for tasks
+git config merge.agent.name "Agent Merge Driver" || true
+git config merge.agent.driver "agent merge-driver %A %B" || true
+
 # Task manager: Import tasks after branch switch
 if [ -f .tasks/tasks.jsonl ]; then
     task import -i .tasks/tasks.jsonl 2>/dev/null || true
-- 
cgit v1.2.3