chore: back-merge release 0.11.8 into next#388
Merged
Conversation
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>
….8-into-next # Conflicts: # CHANGELOG.md
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.
Why
Proactive back-merge to prevent the recurring release-PR conflict.
release: 0.11.8(#386) was squash-merged intomainas2df25c7a, whichnexthas no ancestry to. In this squash-only repo that divergence resurfaces asCONFLICTINGon the next release PR (0.11.9). Landing a true merge commit now makes2df25c7aan ancestor ofnextso the next release cuts clean.What
main(0.11.8,2df25c7a) intonextas a true merge commit.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.8release entry above## 0.11.7.src/diff vsnextis the_version.pybump. 0.11.8's features originated onnext, so nothing to reconcile in code.Merge with a real merge commit, NOT squash (a squashed back-merge is a no-op).
allow_merge_commitwas temporarily enabled; restore squash-only after merging.Greptile Summary
This is a proactive back-merge of the
release: 0.11.8squash-merge frommainintonext, landing a true merge commit sonextinherits2df25c7aas an ancestor and the next release PR (0.11.9) cuts without conflicts.0.11.8uniformly across_version.py,pyproject.toml, and.release-please-manifest.json.CHANGELOG.mdgains the## 0.11.8entry (CLI LangGraph template + tracing metrics) inserted between the existingUnreleasedand## 0.11.7sections.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
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 ✓Reviews (1): Last reviewed commit: "Merge remote-tracking branch 'origin/mai..." | Re-trigger Greptile