Repository navigation

fix(server): a selected-file commit keeps other files' merge conflicts - #33115

Merged

juliusmarminge merged 10 commits into

pingdotgg:mainfrom

only21mil:fix/commit-all-skips-conflict-markers

Nov 15, 2026

Merged

fix(server): a selected-file commit keeps other files' merge conflicts#33115
juliusmarminge merged 10 commits into
pingdotgg:mainfrom
only21mil:fix/commit-all-skips-conflict-markers

Commits on Nov 8, 2026
- fix(server): commits no longer include files that still have conflict markers
  
  only21mil
  and
  claude
  committed
  20fe1fd
- fix(server): check working-tree-encoding files for conflict markers in their staged form
  
  only21mil
  and
  claude
  committed
  202972d
- fix(server): decode conflict markers with the encoding Git wrote them in
  
  only21mil
  and
  claude
  committed
  d5ed9a7
Commits on Nov 10, 2026
- fix(server): preserve conflicts when committing unrelated files
  maria-rcks
  committed
  6d424b2
Commits on Nov 12, 2026
- Merge branch 'main' into fix/commit-all-skips-conflict-markers
  
  only21mil
  and
  claude
  committed
  417f49a
- fix(server): a selected-file commit keeps other files' merge conflicts
  
  only21mil
  and
  claude
  committed
  bed3550
- fix(server): the selected-file conflict check reads only the index
  
  only21mil
  and
  claude
  committed
  637e1a6
Commits on Nov 15, 2026