Skip to content

fix(server): refuse unresolved UTF-16 merge commits - #36817

Merged
juliusmarminge merged 6 commits into
pingdotgg:mainfrom
StiensWout:t3/reject-utf16-merge-markers
Nov 14, 2026
Merged

fix(server): refuse unresolved UTF-16 merge commits#36817
juliusmarminge merged 6 commits into
pingdotgg:mainfrom
StiensWout:t3/reject-utf16-merge-markers

test(server): drop conflict-marker-size row unrelated to encoding

6a9fc2d
Select commit
Loading
Failed to load commit list.
Sign in for the full log view

Annotations

1 warning
Collect PR targets
succeeded Nov 14, 2026 in 3s