Skip to content

Release v3.35.3 - #220

Merged
atomantic merged 3 commits into
releasefrom
main
Aug 30, 2026
Merged

Release v3.35.3#220
atomantic merged 3 commits into
releasefrom
main

Conversation

@atomantic

Copy link
Copy Markdown
Owner

Release v3.35.3

Released: 2026-08-30

Highlights

  • Rebase conflicts no longer halt /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.
  • Generated artifacts are rebuilt from canonical inputs. The shared resolution playbook treats generated-file conflicts as deterministic regeneration work, including route catalogs, rather than asking an agent to hand-merge derived output.
  • Reviewer fix pipelines keep moving after concurrent updates. Local-agent, Ollama, and multi-reviewer push retries now route conflicted rebases through the same resolution workflow before classifying publication failures.

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:pr and /do:pr-better: required rebases now resolve and continue instead of stopping at the first conflict.
  • Local-agent, Ollama, and multi-reviewer loops: non-fast-forward push retries now complete conflicted rebases before retrying publication.
  • Agent Skills transformation and curl installers: bundle and manage the new conflict-resolution playbook wherever an affected workflow cites it.

Fixed

  • Prevented generated-file conflicts, including API route catalog drift, from prematurely aborting automated PR delivery.
  • Prevented active rebase conflicts from being misreported as final reviewer push-failed outcomes before resolution was attempted.

Full Changelog

Full Diff: v3.35.2...v3.35.3

@atomantic
atomantic merged commit 7b80c30 into release Aug 30, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant