ben/homefoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Miller
2025-09-11 11:24:13 -06:00
parent a1b1d7e090
commit aa5431c280
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foam_sync.ps1
View File

@ -237,11 +237,11 @@ try {
if ($remoteTimestamp -gt $localTimestamp) { if ($remoteTimestamp -gt $localTimestamp) {
Write-Information "Remote is newer. Pulling with rebase, strategy 'theirs'..." 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 { else {
Write-Information "Local is newer or same age. Pulling with rebase, strategy 'ours'..." 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 } if ($LASTEXITCODE -ne 0) { Write-Error "Rebase during divergence failed. Manual intervention may be required."; exit 1 }

4
foam_sync.sh
View File

@ -100,10 +100,10 @@ else
# if remote is newer, use a 'theirs' strategy # 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 if [[ $(git log --pretty=format:"%at" -n 1 origin/main) -gt $(git log --pretty=format:"%at" -n 1 HEAD) ]]; then
echo "remote is newer" echo "remote is newer"
git pull --rebase -X theirs origin main git pull --rebase --strategy recursive --strategy-option theirs origin main
else else
echo "local is newer" echo "local is newer"
git pull --rebase -X ours origin main git pull --rebase --strategy recursive --strategy-option ours origin main
fi fi
git push origin main git push origin main
fi fi