Skip to content

Schema sync 2026-06-12 from 1.4.611.0#1128

Closed
marabooy wants to merge 3 commits into
masterfrom
schemas/metadata-publishing-2026-06-12
Closed

Schema sync 2026-06-12 from 1.4.611.0#1128
marabooy wants to merge 3 commits into
masterfrom
schemas/metadata-publishing-2026-06-12

Conversation

@marabooy

Copy link
Copy Markdown
Contributor

Schema sync 2026-06-12 from 1.4.611.0

@marabooy marabooy requested a review from a team as a code owner June 12, 2026 01:25
@peombwa

peombwa commented Jun 22, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

…blishing-2026-06-12

# 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

Resolved the merge conflicts in schemas/beta-Prod.csdl (2 conflicts) and schemas/v1.0-Prod.csdl (1 conflict) by merging master into this branch. The conflicts were in newly added entity types and enum types that existed in master but not in this branch — all resolved by accepting the incoming changes from master. Merge commit: e23d3c4.

Copilot AI requested a review from peombwa June 22, 2026 21:03
@peombwa

peombwa commented Jun 22, 2026

Copy link
Copy Markdown
Member

No change.

@peombwa peombwa closed this Jun 22, 2026
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