diff options
| -rw-r--r-- | Omni/Agent.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Omni/Agent.hs b/Omni/Agent.hs index 53ac5ec..280d034 100644 --- a/Omni/Agent.hs +++ b/Omni/Agent.hs @@ -88,6 +88,10 @@ mergeDriver args = do theirs <- getArgOrExit args (Cli.argument "theirs") -- Set TASK_DB_PATH to ours (the file git provided as the current version) + -- Since we are no longer using git-tracked tasks.jsonl, this merge driver logic needs rethinking. + -- If the merge driver is called, it means git found a conflict in .tasks/tasks.jsonl, but we deleted it. + -- So this code might be dead, or we might be dealing with legacy files during a rebase. + -- For now, we'll keep the logic but be aware it's likely unused. Env.setEnv "TASK_DB_PATH" ours TaskCore.importTasks theirs Exit.exitSuccess |