Blocking upstream merge conflict: Azure.Mcp.Server-3.0.0-beta.42
Open
@g2vinay is already working on this.
Since Sep 10, 2026.
customer-reported
engineering item
needs-team-attention
server-Azure.Mcp
tools-Core
- Dominant language
- C#
- Stars
- 3.7k
- Forks
- 624
- Avg merge
- 2d 20h
- Merged PRs (30d)
- 220
Description
# 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
```powershell
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
```
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Assessment
This issue has not been assessed yet.