diff options
| -rwxr-xr-x | Omni/Agent/start-worker.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Omni/Agent/start-worker.sh b/Omni/Agent/start-worker.sh index 09fccab..1aaba7f 100755 --- a/Omni/Agent/start-worker.sh +++ b/Omni/Agent/start-worker.sh @@ -56,8 +56,8 @@ while true; do # A. Sync with Live # We use 'git rebase' to keep history linear git checkout omni-worker-1 >/dev/null 2>&1 - git fetch origin live >/dev/null 2>&1 - git rebase origin/live >/dev/null 2>&1 || echo "Warning: Rebase conflict. Resolve manually." + # Rebase directly on local live branch (shared repo) + git rebase live >/dev/null 2>&1 || echo "Warning: Rebase conflict. Resolve manually." # B. Sync Tasks sync_tasks @@ -139,8 +139,7 @@ Context: git checkout omni-worker-1 >/dev/null # Sync again (rebase on latest live) - git fetch origin live >/dev/null 2>&1 - git rebase origin/live >/dev/null 2>&1 + git rebase live >/dev/null 2>&1 sync_tasks # Update status |