Skip to content

fix: resolve do:pr rebase conflicts autonomously - #219

Merged
atomantic merged 1 commit into
mainfrom
fix/do-pr-resolve-rebase-conflicts
Aug 30, 2026
Merged

fix: resolve do:pr rebase conflicts autonomously#219
atomantic merged 1 commit into
mainfrom
fix/do-pr-resolve-rebase-conflicts

Conversation

@atomantic

Copy link
Copy Markdown
Owner

Summary

  • make required do:pr rebases resolve conflicts and continue instead of stopping at the first conflict
  • add a shared resolution playbook that preserves human-authored intent and regenerates derived artifacts from canonical inputs
  • apply the same behavior to reviewer push retries and bundle the playbook into supported Agent Skills installations
  • add regression coverage for the workflow, installer allowlists, and deferred library bundling

Validation

  • npm test — 429 tests passed
  • node bin/cli.js --list
  • node bin/cli.js --dry-run
  • git diff --check main...HEAD

Review

  • required local code review completed with no findings
  • no external reviewer was configured for this run

@atomantic
atomantic merged commit 30a721c into main Aug 30, 2026
4 checks passed
@atomantic
atomantic deleted the fix/do-pr-resolve-rebase-conflicts branch August 30, 2026 22:20
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