Repository navigation
Pickup-time rebase treats a rebase that never started as a no-conflict stop, so real conflicts go to MergeConflictResolutionFailed - #767
Merged
Conversation
…ict stops RebaseCheckedOutBranchWithScopeFenceAsync treated any non-zero rebase exit as a stop, so a rebase that never started (dirty worktree, untracked overwrite, missing upstream, lock, identity/hook) fell into the resolver, which found no unmerged paths and parked with the misleading 'stopped with no unmerged paths' error while git's stderr was never logged. Now a failed initial rebase first probes for sequencer state (REBASE_HEAD or rebase-merge/rebase-apply); when absent it logs stdout/stderr plus git status --porcelain, classifies the failure, cleans pipeline-owned .codeybox/ scratch (agent-log tee files that survive suspend/resume in the git tree and are stripped from every orchestrator commit) with a single retry, and otherwise throws a precise 'could not start' error carrying git's stderr. Failed --continue/--skip steps log stderr and re-verify sequencer state. Tests: staged-sandbox cases for scratch cleanup, untracked overwrite, resolver reachability, and per-step stderr logging; unit tests for the classifier, porcelain parser, and in-progress probe. CodeyBox-Prompt-Revision: 1 Co-Authored-By: CodeyBox <noreply@codeybox.invalid>
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
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.
Automated via CodeyBox — work item 8dad084e46424e809ee1ed66b35be9f9
Initiated by CodeyBox operator
Co-Authored-By: CodeyBox noreply@codeybox.invalid
🤖 Generated with CodeyBox