diff options
| -rwxr-xr-x | Omni/Agent/start-worker.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Omni/Agent/start-worker.sh b/Omni/Agent/start-worker.sh index 25f325c..09fccab 100755 --- a/Omni/Agent/start-worker.sh +++ b/Omni/Agent/start-worker.sh @@ -54,9 +54,10 @@ while true; do echo "$(date): Syncing and checking for work..." # A. Sync with Live - # We use 'git merge' to update our base branch from the shared 'live' ref + # We use 'git rebase' to keep history linear git checkout omni-worker-1 >/dev/null 2>&1 - git merge live --no-edit >/dev/null 2>&1 || echo "Warning: Merge conflict or issue merging live." + git fetch origin live >/dev/null 2>&1 + git rebase origin/live >/dev/null 2>&1 || echo "Warning: Rebase conflict. Resolve manually." # B. Sync Tasks sync_tasks @@ -137,8 +138,9 @@ Context: # Switch back to base git checkout omni-worker-1 >/dev/null - # Sync again (in case live moved) - git merge live --no-edit >/dev/null 2>&1 + # Sync again (rebase on latest live) + git fetch origin live >/dev/null 2>&1 + git rebase origin/live >/dev/null 2>&1 sync_tasks # Update status |