codex: stop recovery from skipping failed merges - #89
Merged
Conversation
ttaylorr-oai
marked this pull request as ready for review
September 8, 2026 00:43
tnm-oai
approved these changes
Sep 8, 2026
A failed octopus merge can roll back its index and leave no unmerged paths. continue_rerere_resolution() treats that state as a completed rerere resolution and runs rebase --continue, dropping the merge and continuing with its descendants. Only continue when there are staged changes or MERGE_HEAD records a merge to commit. Keep an aborted octopus stopped so recovery can preserve its parents. Cover the clean-index failure with a real three-parent replay followed by another commit. Signed-off-by: Taylor Blau <ttaylorr@openai.com>
ttaylorr-oai
force-pushed
the
tb/codex/stop-unresolved-rebase
branch
from
September 8, 2026 00:48
fc174dc to
f8169ec
Compare
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.
The rerere retry loop can advance past a failed octopus merge because Git rolls back the index and leaves no unmerged paths. Require staged changes or a pending
MERGE_HEADbefore continuing, so the failed merge remains available for recovery.The regression test reproduces a three-parent merge failure followed by another commit. It fails with the current controller and passes with the fix; the existing rerere and merge-preservation tests also pass. All 137 controller tests pass, and the GitHub plan-admission check is green.