summaryrefslogtreecommitdiff
path: root/Omni/Ide/hooks/post-merge
diff options
context:
space:
mode:
Diffstat (limited to 'Omni/Ide/hooks/post-merge')
-rwxr-xr-xOmni/Ide/hooks/post-merge6
1 files changed, 6 insertions, 0 deletions
diff --git a/Omni/Ide/hooks/post-merge b/Omni/Ide/hooks/post-merge
index fcfd314..3e0495b 100755
--- a/Omni/Ide/hooks/post-merge
+++ b/Omni/Ide/hooks/post-merge
@@ -1,5 +1,11 @@
#!/usr/bin/env bash
"${CODEROOT:?}"/Omni/Ide/hooks/post-checkout 'HEAD@{1}' HEAD
+
+# Task manager: Import tasks after git pull/merge
+if [ -f .tasks/tasks.jsonl ]; then
+ task import -i .tasks/tasks.jsonl 2>/dev/null || true
+fi
+
## START BRANCHLESS CONFIG
git branchless hook post-merge "$@"