Blocking merge conflict: Azure.Mcp.Server-3.0.0-beta.42

Integration branch: integration/azure-mcp/3.0.0-beta.42

Conflicted files

• servers/Azure.Mcp.Server/CHANGELOG.md

MCS repository-governance conflicts

• None

Governance conflicts are never resolved with blanket ours or theirs strategies. Preserve the active MCS control unless a reviewed upstream change is deliberately adopted.

Local recovery

git fetch origin upstream --tags
git switch integration/azure-mcp/3.0.0-beta.42
git merge --no-ff Azure.Mcp.Server-3.0.0-beta.42
git status