Repository navigation

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

Commits on Nov 14, 2026
- fix(server): Commit refuses UTF-16 files that still have conflict markers
  
  committed
  13fd274
- refactor(server): trim UTF-16 conflict refusal test and comment
  
  committed
  dfcf0fd
- fix(server): allow resolved large encoded merge files
  
  committed
  cdbd303
- chore(server): clarify conflict guard comments and test names
  
  StiensWout
  and
  claude
  committed
  c7fa686
- Merge remote-tracking branch 'origin/main' into t3/reject-utf16-merge-markers
  juliusmarminge
  committed
  a2fd930
- test(server): drop conflict-marker-size row unrelated to encoding
  
  juliusmarminge
  and
  claude
  committed
  6a9fc2d