Test 870ebb8850 fix: use git pull --ff-only in update/install to avoid divergent branch error ...

Fresh installs without pull.rebase configured hit a git error when
running hermes update because git doesn't know how to reconcile
divergent branches. --ff-only is the right strategy: it works for the
normal case (local branch is behind remote) and fails cleanly if the
user somehow has local commits, rather than silently rebasing them.

2026-03-20 22:28:55 -07:00

156 KiB

Raw Blame History

View Raw