Skip to content

sync-preview: merge main into preview#1043

Open
github-actions[bot] wants to merge 3 commits intopreviewfrom
sync-preview/merge-main-20260429-194517
Open

sync-preview: merge main into preview#1043
github-actions[bot] wants to merge 3 commits intopreviewfrom
sync-preview/merge-main-20260429-194517

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

The automated sync-preview workflow could not cleanly merge main into preview.

This PR contains the merge with conflict markers. To resolve:

  1. Check out this branch locally:
    gh pr checkout <this-pr-number>
  2. Search for conflict markers and resolve them:
    grep -rn '<<<<<<< HEAD' .
  3. Keep preview-specific values (package version, preview tests, etc.) — accept main's changes for everything else.
  4. Commit and push, then merge this PR.

This must be resolved before the next coordinated release.

cc @99039782+aidandaly24

Opened automatically by the sync-preview workflow.

@github-actions github-actions Bot requested a review from a team April 29, 2026 19:45
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