Twinned from https://github.com/cfsh/ninefold/issues/119 by tools/beads/import_github.py's reconcile pass.
games/tonapse/ui/SongGrid.cs is recorded in git's index as binary (-text), even though .gitattributes declares * text=auto eol=lf and every sibling UI file is normalized to LF text. You can see it with git ls-files --eol:
``` i/lf w/lf attr/text=auto eol=lf games/tonapse/TonapseHome.cs i/lf w/lf attr/text=auto eol=lf games/tonapse/ui/PianoRoll.cs i/-text w/-text attr/text=auto eol=lf games/tonapse/ui/SongGrid.cs <-- binary i/lf w/lf attr/text=auto eol=lf games/tonapse/ui/SoundPicker.cs ```
Because git treats it as binary, any merge or rebase that touches SongGrid.cs produces a whole-file conflict ("binary files differ") instead of a normal 3-way text merge. This session hit it ~5 times rebuilding the f5/integration branch and cherry-picking the #54 stack (#116/#117/#118 all touch this file) — each time it had to be resolved by hand (git checkout --ours + re-applying the small change via an editor), which is slow and error-prone.
The file almost certainly got committed once with CRLF / a byte that tipped git's auto-detection to binary; once a blob is -text in the index it stays that way until explicitly renormalized.
Renormalize the one file so git stores it as LF text like its siblings:
``` git checkout main && git pull git add --renormalize games/tonapse/ui/SongGrid.cs git status # should show it modified (CRLF/binary -> LF) git commit -m "chore(tonapse): renormalize SongGrid.cs to LF text" ```
Then confirm git ls-files --eol games/tonapse/ui/SongGrid.cs shows i/lf … attr/text=auto eol=lf. Worth also git add --renormalize . once to catch any other stragglers, and eyeballing that the diff is pure line-ending noise.
Do this after the open #54 PRs (#117, #118) land — a renormalize rewrites the entire file, so doing it now would conflict massively with those in-flight branches. Once they're merged, this is a clean isolated one-file chore.
Refs #54 (the recurring conflict source, not part of its scope).
None.
No comments.