diff --git a/hermes_cli/main.py b/hermes_cli/main.py
index 33d3a0601..dfd8bd419 100644
--- a/hermes_cli/main.py
+++ b/hermes_cli/main.py
@@ -2688,7 +2688,7 @@ def cmd_update(args):
 
         print("→ Pulling updates...")
         try:
-            subprocess.run(git_cmd + ["pull", "origin", branch], cwd=PROJECT_ROOT, check=True)
+            subprocess.run(git_cmd + ["pull", "--ff-only", "origin", branch], cwd=PROJECT_ROOT, check=True)
         finally:
             if auto_stash_ref is not None:
                 _restore_stashed_changes(
diff --git a/scripts/install.sh b/scripts/install.sh
index c2ec21834..d4edf2e11 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -577,7 +577,7 @@ clone_repo() {
 
             git fetch origin
             git checkout "$BRANCH"
-            git pull origin "$BRANCH"
+            git pull --ff-only origin "$BRANCH"
 
             if [ -n "$autostash_ref" ]; then
                 local restore_now="yes"