fix(cli): handle update from non-main branches and ff-only failures#3216
Closed
erosika wants to merge 3 commits intoNousResearch:mainfrom
Closed
fix(cli): handle update from non-main branches and ff-only failures#3216erosika wants to merge 3 commits intoNousResearch:mainfrom
erosika wants to merge 3 commits intoNousResearch:mainfrom
Conversation
…ousResearch#3213) Track head_branch separately from the update target. When the user is on a different branch, update the local main ref via fetch rather than trying to merge into the current branch. When on the target branch, fall back to --rebase if --ff-only fails.
zebster-cmd
added a commit
to zebster-cmd/hermes-agent
that referenced
this pull request
Apr 7, 2026
…ousResearch#3216) Cherry-picked from erosika's PR NousResearch#3216 with conflict resolution. - Stay on current branch instead of switching to main during update - Use pull --rebase as fallback instead of reset --hard - For cross-branch updates, use fetch origin main:main without checkout - Defer stashing until after confirming updates exist - Preserves upstream gateway_mode support and update_succeeded guard
zebster-cmd
added a commit
to zebster-cmd/hermes-agent
that referenced
this pull request
Apr 7, 2026
…changes for plugin architecture - Update test_update_autostash.py: tests now expect pull --rebase fallback (not reset --hard), and fetch origin main:main for cross-branch updates (not checkout main) - Remove broken honcho test classes (TestHonchoActivation, TestHonchoPrefetchScheduling) from test_run_agent.py -- these reference old monolithic APIs (HonchoClientConfig, _honcho_prefetch, etc.) that moved to the plugin architecture - Remove broken TestSystemPromptStability honcho methods that reference _inject_honcho_turn_context (now in plugin) - Keep passing TestExtractAgentNameFromSoul tests - Update test_client.py to expect host-block baseUrl override (PR NousResearch#2645)
Contributor
|
Thanks for this fix, @erosika! The issues it addresses are already resolved on This is an automated hermes-sweeper review.
The approach differs slightly (reset --hard vs. --rebase for the ff-only fallback), but covers the same failure scenarios described in #3213. Closing as implemented on main. |
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.
Summary
head_branchseparately from the update targetbranchgit fetch origin main:mainrather than trying to merge into the current branch--rebaseif--ff-onlyfailsCloses #3213