diff options
Diffstat (limited to 'Omni/Agent/start-worker.sh')
| -rwxr-xr-x | Omni/Agent/start-worker.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Omni/Agent/start-worker.sh b/Omni/Agent/start-worker.sh index 0b09d5e..5607f6d 100755 --- a/Omni/Agent/start-worker.sh +++ b/Omni/Agent/start-worker.sh @@ -57,7 +57,10 @@ while true; do # We use 'git rebase' to keep history linear git checkout omni-worker-1 >/dev/null 2>&1 # Rebase directly on local live branch (shared repo) - git rebase live >/dev/null 2>&1 || echo "Warning: Rebase conflict. Resolve manually." + if ! git rebase live >/dev/null 2>&1; then + echo "Warning: Rebase conflict at start of loop. Aborting rebase and proceeding with local state." + git rebase --abort || true + fi # B. Sync Tasks sync_tasks |