Conversation
…icts fix: resolve do:pr rebase conflicts autonomously
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.
Release v3.35.3
Released: 2026-08-30
Highlights
/do:pr. Required rebases now resolve conflicts, validate the result, and continue through review and PR creation instead of handing routine conflict resolution back to the user.Added
lib/rebase-conflict-resolution.md: a shared autonomous playbook for inspecting replay context, resolving authored sources semantically, regenerating derived artifacts, validating the resolution, and continuing the rebase.Changed
/do:prand/do:pr-better: required rebases now resolve and continue instead of stopping at the first conflict.Fixed
push-failedoutcomes before resolution was attempted.Full Changelog
Full Diff: v3.35.2...v3.35.3