Skip to content

Schema sync 2026-06-09 from 1.4.611.0#1122

Merged
peombwa merged 2 commits into
masterfrom
schemas/metadata-publishing-2026-06-09
Jun 22, 2026
Merged

Schema sync 2026-06-09 from 1.4.611.0#1122
peombwa merged 2 commits into
masterfrom
schemas/metadata-publishing-2026-06-09

Conversation

@marabooy

@marabooy marabooy commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Schema sync 2026-06-09 from 1.4.611.0

@marabooy marabooy requested a review from a team as a code owner June 9, 2026 20:31
@peombwa

peombwa commented Jun 22, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

…blishing-2026-06-09

# Conflicts:
#	schemas/beta-Prod.csdl
#	schemas/v1.0-Prod.csdl

Copilot AI commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Merge conflicts resolved in 99291c5. There were 3 conflicts total:

  • schemas/beta-Prod.csdl: 2 conflicts (new entityMapping/entityMappingConfiguration and mailbox*EntityMapping entity types added in master)
  • schemas/v1.0-Prod.csdl: 1 conflict (new roleType enum added in master)

All were resolved by keeping master's additions.

Copilot AI requested a review from peombwa June 22, 2026 21:10
@peombwa peombwa merged commit 7d9211d into master Jun 22, 2026
2 checks passed
@peombwa peombwa deleted the schemas/metadata-publishing-2026-06-09 branch June 22, 2026 21:21
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.

3 participants