Conversation
- Validate merge resolution: check mergetool exit code and scan for remaining conflict markers before staging. Honor git's mergetool.trustExitCode / mergetool.<tool>.trustExitCode config; when unset, prompt interactively or skip in --quiet mode. - Status: warn when current branch does not match the integration target encoded in the branch name; suggest the correct checkout. - TUI: mark current branch with ">" prefix; draw a separator between local and remote branches in pick_branch dialogs. - Detect stale local tracking branches: ensure_local_branch_for_operation now compares local/remote SHAs and bails with a pull suggestion when they diverge. - Add unit tests for conflict marker detection and integration tests for all trustExitCode variants.
When 'mergetopus' or 'mergetopus SOURCE' targets an integration branch, show a TUI picker asking the user whether to switch to it and view status, or proceed with a new merge. In --quiet mode, bail with an explicit error instead of silently redirecting. Broaden branch discovery to cover remote-only refs so that a second workstation (with only remote-tracking branches) can discover, resume, and resolve existing integration contexts: - Add branch_exists_anywhere() combining local + remote ref lookup - Use ensure_local_branch_for_operation() to materialize tracking branches before checkout in merge workflow, status, and resolve paths - Search both local and remote refs in status branch discovery - Use best_ref_for_local_branch() for kokomeco merge suggestions New TUI widget: pick_option() — a generic Up/Down/Enter option picker.
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
1 participant
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.
remaining conflict markers before staging. Honor git's
mergetool.trustExitCode / mergetool..trustExitCode config;
when unset, prompt interactively or skip in --quiet mode.
target encoded in the branch name; suggest the correct checkout.
local and remote branches in pick_branch dialogs.
now compares local/remote SHAs and bails with a pull suggestion
when they diverge.
for all trustExitCode variants.