fix: use git pull --rebase in update/install to avoid divergent branch error#2274
Merged
fix: use git pull --rebase in update/install to avoid divergent branch error#2274
Conversation
…ch 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.
teknium1
force-pushed
the
hermes/hermes-40b195db
branch
from
e03a74e to
870ebb8
Compare
|
Could there have been a mix-up? The title says --rebase, but the commit is --ff-only |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On a fresh machine,
hermes updatefails with:Because git doesn't have
pull.rebaseconfigured by default. Fixed by passing--rebaseexplicitly in both places:hermes_cli/main.py—hermes updatecommandscripts/install.sh— installer update path2 files, 2 lines changed.