Update auto-sync scripts to use git reset --hard

This commit is contained in:
dennii committed 2025-12-28 10:17:18 +11:00
1 parent 929477c1f7
commit 039e126d9a
2 files changed
+6 -5

No files matched your search

+3 -3
View File
@@ -36,9 +36,9 @@ fi
log "🔄 Changes detected! Local: ${LOCAL:0:7} -> Remote: ${REMOTE:0:7}"
# Pull changes
if ! git pull origin main; then
log "❌ Error: Git pull failed"
# Force update
if ! git reset --hard origin/main; then
log "❌ Error: Git reset failed"
exit 1
fi
+3 -2
View File
@@ -39,8 +39,9 @@ fi
log "🔄 Changes detected! Pulling updates..."
# Pull changes
git pull origin main 2>&1 | tee -a "$LOG_FILE"
# Force update (overwrite local changes)
log "⚠️ Resetting local changes to match remote..."
git reset --hard origin/main 2>&1 | tee -a "$LOG_FILE"
# Install/update dependencies if package.json changed
if git diff --name-only $LOCAL $REMOTE | grep -q "package.json"; then