Skip to content

sync-preview: merge main into preview (conflicts)#1259

Open
agentcore-devx-automation[bot] wants to merge 3 commits into
previewfrom
sync-preview/merge-main-20260514-212544
Open

sync-preview: merge main into preview (conflicts)#1259
agentcore-devx-automation[bot] wants to merge 3 commits into
previewfrom
sync-preview/merge-main-20260514-212544

Conversation

@agentcore-devx-automation
Copy link
Copy Markdown

The automated sync could not cleanly merge main into preview.

This PR contains 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.

cc @nborges-aws

Opened automatically by the sync-preview workflow.

nborges-aws and others added 3 commits May 14, 2026 15:48
* chore: update CP semantics to expect redesigned namespaces field

* fix: update integ tests pointing to old namespace field

* fix: restrict episodic param and formatting
* chore: update namespace design for data plane

* fix: add web-UI API types and additional testing
@agentcore-devx-automation agentcore-devx-automation Bot requested a review from a team May 14, 2026 21:25
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