Repository navigation
Blocking upstream merge conflict: Azure.Mcp.Server-3.0.0-beta.47 #3794
Description
Blocking merge conflict: Azure.Mcp.Server-3.0.0-beta.47
Integration branch: integration/azure-mcp/3.0.0-beta.47
Conflicted files
.github/agents/agentic-workflows.agent.md.github/dependabot.yml.github/workflows/actionlint.yml.github/workflows/spelling.yaml.mcs/upstream/github/agents/agentic-workflows.agent.md.mcs/upstream/github/agents/agentic-workflows.mdCONTRIBUTING.mdcore/Azure.Mcp.Core/src/Services/Azure/BaseAzureResourceService.cscore/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/NamespaceToolLoader.csglobal.jsonservers/Azure.Mcp.Server/CHANGELOG.mdservers/Azure.Mcp.Server/docs/e2eTestPrompts.md
MCS repository-governance conflicts
.github/agents/agentic-workflows.agent.md.github/dependabot.yml.github/workflows/actionlint.yml.github/workflows/spelling.yamlCONTRIBUTING.md
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.47
git merge --no-ff Azure.Mcp.Server-3.0.0-beta.47
git status
Activity
github-actions commentedon Sep 28, 2026
Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc Alan Zimmer (@alzimmermsft) Vinay Gera (@g2vinay) @microsoft/azure-mcp.