Repository navigation
[Bug]: commit-all commits unresolved UTF-16 merge markers #36816
Description
Before submitting
- I searched existing issues and did not find a duplicate.
- I included enough detail to reproduce or investigate the problem.
Area
apps/server
Steps to reproduce
- In a Git repository, set
README.md text working-tree-encoding=UTF-16in.gitattributes, and commit a BOM-prefixed UTF-16LE README. - Create two branches that change the same line differently. Merge them to leave README.md conflicted, with Git's unmerged index entries intact.
- Open that project in T3 Code and use Commit from the Git action menu. Leave all changed files selected, enter a commit message and submit.
Expected behavior
Refuse the commit until the conflict markers are resolved, preserving HEAD and the unresolved index entries.
Actual behavior
The merge succeeds and HEAD contains the unresolved <<<<<<<, ======= and >>>>>>> lines. Git detects the markers in its decoded view, but T3 rereads the working file as UTF-8 and misses them before staging all files.
Impact
Minor bug or occasional failure. Deterministic for this encoding and unresolved state; the result is an unintended commit containing merge markers.
Version or commit
main @ ee4ef06; reproduced again against refreshed main before filing.
Environment
Linux, Git, isolated web client with the free replay provider. BOM-prefixed UTF-16LE via working-tree-encoding=UTF-16. Other encoding variants are not claimed.
Logs or stack traces
The focused public GitVcsDriver.commit test fails on main because commit-all succeeds while README.md still contains conflict markers. The real-web paired scenario also commits on base and refuses on the fix.
Screenshots, recordings, or supporting files
Workaround
Resolve the markers manually before committing. The existing selected-file guard refuses in-progress merges, but all-files-selected uses commit-all.
Found by the maintainer bughunt and independently confirmed by Claude Opus 5.5. Related merged fixes #35132 and #35120 cover ordinary conflict markers and selected-file operation guards respectively; this report concerns encoded working files.
Activity