From aa5431c280bfdd92f08cc99400eb0cc568ea72e4 Mon Sep 17 00:00:00 2001
From: Ben Miller <ben.p.miller@gmail.com>
Date: Thu, 11 Sep 2025 11:24:13 -0600
Subject: [PATCH] foam_sync.ps1 (LIFEBALANCE) 2025-09-11T11:24:11Z

---
 foam_sync.ps1 | 4 ++--
 foam_sync.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/foam_sync.ps1 b/foam_sync.ps1
index 91e5e7a..6a37251 100644
--- a/foam_sync.ps1
+++ b/foam_sync.ps1
@@ -237,11 +237,11 @@ try {
 
     if ($remoteTimestamp -gt $localTimestamp) {
       Write-Information "Remote is newer. Pulling with rebase, strategy 'theirs'..."
-      git pull --rebase -X theirs origin main
+      git pull --rebase --strategy recursive --strategy-option theirs origin main
     }
     else {
       Write-Information "Local is newer or same age. Pulling with rebase, strategy 'ours'..."
-      git pull --rebase -X ours origin main
+      git pull --rebase --strategy recursive --strategy-option ours origin main
     }
 
     if ($LASTEXITCODE -ne 0) { Write-Error "Rebase during divergence failed. Manual intervention may be required."; exit 1 }
diff --git a/foam_sync.sh b/foam_sync.sh
index 8b87d26..3c6d4d0 100644
--- a/foam_sync.sh
+++ b/foam_sync.sh
@@ -100,10 +100,10 @@ else
   # if remote is newer, use a 'theirs' strategy
   if [[ $(git log --pretty=format:"%at" -n 1 origin/main) -gt $(git log --pretty=format:"%at" -n 1 HEAD) ]]; then
     echo "remote is newer"
-    git pull --rebase -X theirs origin main
+    git pull --rebase --strategy recursive --strategy-option theirs origin main
   else
     echo "local is newer"
-    git pull --rebase -X ours origin main
+    git pull --rebase --strategy recursive --strategy-option ours origin main
   fi
   git push origin main
 fi