foam_sync.ps1 (LIFEBALANCE) 2025-09-11T11:24:11Z

2025-09-11 11:24:13 -06:00
parent a1b1d7e090
commit aa5431c280
2 changed files with 4 additions and 4 deletions
--- 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