diff options
Diffstat (limited to 'Omni')
| -rwxr-xr-x | Omni/Ide/hooks/post-checkout | 4 | ||||
| -rw-r--r-- | Omni/Task.hs | 4 |
2 files changed, 7 insertions, 1 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 diff --git a/Omni/Task.hs b/Omni/Task.hs index b62e1c1..12842db 100644 --- a/Omni/Task.hs +++ b/Omni/Task.hs @@ -117,7 +117,9 @@ move args let quiet = args `Cli.has` Cli.longOption "quiet" initTaskDb callCommand "git config commit.template .gitmessage" - unless quiet <| putText "Task database initialized and git commit template configured. Use 'task create' to add tasks." + callCommand "git config merge.agent.name 'Agent Merge Driver' || true" + callCommand "git config merge.agent.driver 'agent merge-driver %A %B' || true" + unless quiet <| putText "Task database initialized and configured. Use 'task create' to add tasks." | args `Cli.has` Cli.command "create" = do title <- getArgText args "title" taskType <- case Cli.getArg args (Cli.longOption "type") of |