Handle conflict markers#12642

Merged

chsienki merged 3 commits into

dotnet:mainfrom

chsienki:conflict_markers

Jan 6, 2026

Dotnet Policy Service / license/cla succeeded Jan 6, 2026 in 0s

All CLA requirements met.

This check verifies that the author has agreed to a CLA with Microsoft.

View more details on Dotnet Policy Service