Re: help request: unable to merge UTF-16-LE "text" file

This is in reply to the message at https://lore.kernel.org/all/20220422184211.5z67sxrgq2zm3tvd@compass/#t

Sent via MS Outlook - hope this reaches the online thread.

------------------------------------------------------------------------

On Windows, if you do

    git add

from an ordinary Command Prompt, it will fail to call iconv.exe to perform the necessary text conversion. I.E. your UTF-16LE with BOM file will not be properly converted by Git to UTF-8 for its internal storage, leading to subsequent encoding errors.

So, in addition to setting the working-tree-encoding of the file to UTF-16LE-BOM in .gitattributes prior to adding the file, be sure to run:

    git add   

from a git bash console when adding such files.

- Michael