diff options
Diffstat (limited to 'Omni/Ide')
| -rwxr-xr-x | Omni/Ide/hooks/post-checkout | 4 |
1 files changed, 4 insertions, 0 deletions
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 |