From 04f82d52994b409cfcca0dcf6afce609238fea01 Mon Sep 17 00:00:00 2001 From: Omni Worker Date: Fri, 21 Nov 2025 05:24:19 -0500 Subject: task: t-rWa5yilwM.2 done (Omni.Agent.Worker) Amp-Thread-ID: https://ampcode.com/threads/T-7109f8d0-feb4-4a24-bc4b-37743227e2cb Co-authored-by: Amp --- Omni/Agent/Git.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Omni/Agent/Git.hs') diff --git a/Omni/Agent/Git.hs b/Omni/Agent/Git.hs index 7ee8a16..cf9a122 100644 --- a/Omni/Agent/Git.hs +++ b/Omni/Agent/Git.hs @@ -144,10 +144,10 @@ git dir args = do syncWithLive :: FilePath -> IO () syncWithLive repo = do Log.info ["git", "syncing with live"] - git repo ["fetch", "origin", "live"] - + -- git repo ["fetch", "origin", "live"] -- Optional + -- Try rebase, if fail, abort - let cmd = (Process.proc "git" ["rebase", "origin/live"]) {Process.cwd = Just repo} + let cmd = (Process.proc "git" ["rebase", "live"]) {Process.cwd = Just repo} (code, _, err) <- Process.readCreateProcessWithExitCode cmd "" case code of Exit.ExitSuccess -> pure () -- cgit v1.2.3