Reconcile dev after merge to main for v2.9.0
#8688
Merged
Conversation
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
✅ Docs preview readyThe preview is ready to be viewed. View the preview File Changes 0 new, 1 changed, 0 removedBuild ID: ad6514def18349d8d4eb5654 URL: https://www.apollographql.com/docs/deploy-preview/ad6514def18349d8d4eb5654 |
Member
Author
|
This feels ... wrong. I think I was in the wrong directory or git worktree. I'm going to mark this as a draft for now. |
abernix
force-pushed
the
reconcile-v2.9.0
branch
from
0e46326 to
7d315f3
Compare
This reverts commit 171c245.
Member
Author
|
Ok, the answer was that we had reverted 171c245, but we hadn't put that back on dev. That almost happened in #8660, but then #8671 came along with claims to fix it. That works for me, just meant that the reconcilation looked more destructive than it should have. To compensate for this (that is to make sure that I DO NOT break the state of |
carodewig
approved these changes
Dec 1, 2025
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.
This PR reconciles the
mainbranch back intodevafter the release of v2.9.0.What to review:
devremain appropriate for continued developmentOnce approved, this should be merged using a merge commit (not squash).