Skip to content

chore: back-merge release 0.11.8 into next#388

Merged
smoreinis merged 2 commits into
nextfrom
chore/back-merge-0.11.8-into-next
Jun 1, 2026
Merged

chore: back-merge release 0.11.8 into next#388
smoreinis merged 2 commits into
nextfrom
chore/back-merge-0.11.8-into-next

Conversation

@smoreinis
Copy link
Copy Markdown
Contributor

@smoreinis smoreinis commented Jun 1, 2026

Why

Proactive back-merge to prevent the recurring release-PR conflict. release: 0.11.8 (#386) was squash-merged into main as 2df25c7a, which next has no ancestry to. In this squash-only repo that divergence resurfaces as CONFLICTING on the next release PR (0.11.9). Landing a true merge commit now makes 2df25c7a an ancestor of next so the next release cuts clean.

What

  • Merges main (0.11.8, 2df25c7a) into next as a true merge commit.
  • Version metadata advanced to 0.11.8 (_version.py, pyproject.toml, .release-please-manifest.json).
  • CHANGELOG.md: kept next's ## Unreleased (tracing metrics) section, inserted main's ## 0.11.8 release entry above ## 0.11.7.
  • No source/test changes — the only src/ diff vs next is the _version.py bump. 0.11.8's features originated on next, so nothing to reconcile in code.

⚠️ Merge instructions

Merge with a real merge commit, NOT squash (a squashed back-merge is a no-op). allow_merge_commit was temporarily enabled; restore squash-only after merging.

Greptile Summary

This is a proactive back-merge of the release: 0.11.8 squash-merge from main into next, landing a true merge commit so next inherits 2df25c7a as an ancestor and the next release PR (0.11.9) cuts without conflicts.

  • Version metadata advanced to 0.11.8 uniformly across _version.py, pyproject.toml, and .release-please-manifest.json.
  • CHANGELOG.md gains the ## 0.11.8 entry (CLI LangGraph template + tracing metrics) inserted between the existing Unreleased and ## 0.11.7 sections.
  • No src/ logic or test changes are included; this is purely a version and changelog reconciliation commit.

Confidence Score: 5/5

Safe to merge — all changes are version metadata and changelog only, with no logic or test modifications.

Every changed file is version metadata (_version.py, pyproject.toml, .release-please-manifest.json) or changelog. All four files agree on 0.11.8. The CHANGELOG insertion is correctly ordered (Unreleased → 0.11.8 → 0.11.7). No source code or test changes are present. The only operational risk is process-level: the PR must be merged with a real merge commit (not squash), which the author has already called out prominently in the description.

No files require special attention.

Important Files Changed

Filename Overview
.release-please-manifest.json Version bumped from 0.11.7 to 0.11.8 — consistent with the other version files.
CHANGELOG.md 0.11.8 release entry inserted correctly above the 0.11.7 section; Unreleased section preserved at the top.
pyproject.toml Package version bumped from 0.11.7 to 0.11.8 — matches manifest and _version.py.
src/agentex/_version.py Generated version file updated from 0.11.7 to 0.11.8 — consistent across all version sources.

Sequence Diagram

sequenceDiagram
    participant main
    participant next
    participant release_please

    main->>main: "squash-merge PR #386 → commit 2df25c7a (v0.11.8)"
    note over next: next has no ancestry to 2df25c7a<br/>→ next release PR shows CONFLICTING

    next->>next: "back-merge PR #388 (true merge commit)<br/>version bumps + CHANGELOG entry"
    main-->>next: 2df25c7a now ancestor of next

    release_please->>next: next release PR (0.11.9) cuts clean ✓
Loading

Reviews (1): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile

stainless-app Bot and others added 2 commits June 1, 2026 16:22
Co-authored-by: Max Parke <max.parke@scale.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com>
Co-authored-by: Stas Moreinis <stas.moreinis@scale.com>
Co-authored-by: Declan Brady <declan.brady@scale.com>
Co-authored-by: Michael Chou <michael.chou@scale.com>
Co-authored-by: Daniel Miller <daniel.miller@scale.com>
Co-authored-by: Matteo Librizzi <matteo.librizzi@scale.com>
Co-authored-by: Stas Moreinis <smoreinis@gmail.com>
Co-authored-by: James Cardenas <james.cardenas@scale.com>
@smoreinis smoreinis merged commit 9872e9b into next Jun 1, 2026
41 checks passed
@smoreinis smoreinis deleted the chore/back-merge-0.11.8-into-next branch June 1, 2026 23:56
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