Repository navigation
chore(sync): resolve forward-merge conflict (main into next) - #3553
Merged
Merged
Conversation
…dal (#3517) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # packages/components/src/components/List/List.browser.test.tsx
Lisa18289
approved these changes
Oct 22, 2026
Contributor
🚀 Preview DeploymentPreview environments are ready:
Images:
|
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.
Resolves the forward-merge conflict between
mainandnext(ADR 0004 §4), resolved locally with the merge drivers active viapnpm sync:resolve.Merge this as a true merge commit — a squash or rebase merge would break the superset invariant (ADR 0004 §1) and is blocked by branch protection on
next.Escalation: #3552 — closed automatically once
nextcontainsmainagain.