Skip to content

Preserve deploy intent through integration conflicts#41

Merged
mberman84 merged 2 commits into
mainfrom
codex/preserve-failed-integration-intent
Jun 22, 2026
Merged

Preserve deploy intent through integration conflicts#41
mberman84 merged 2 commits into
mainfrom
codex/preserve-failed-integration-intent

Conversation

@mberman84

Copy link
Copy Markdown
Contributor

Summary

  • keep each exact-head deploy request discoverable while a cumulative integration PR is active or conflicted
  • elect one active source thread to own conflict repair and point it at the cumulative PR
  • recover original source requests automatically if the conflicted integration closes
  • retain source intent through resume so late source-head changes cannot strand authorized work
  • release DeployBot v0.2.16 and pin all runtime examples to the reviewed implementation commit

Validation

  • PYTHONPATH=src python3 -m pytest -q (211 tests, 201 subtests)
  • ruff check src tests
  • python3 -m build
  • structured Codex autoreview: clean

@mberman84 mberman84 merged commit 860b5e5 into main Jun 22, 2026
3 checks passed
@mberman84 mberman84 deleted the codex/preserve-failed-integration-intent branch June 22, 2026 01:39
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