{"thread":{"id":"60737","subject":"Re: help request: unable to merge UTF-16-LE \"text\" file","startedAt":"2024-01-12T20:34:39Z","lastAt":"2024-01-12T20:34:39Z","messageCount":1,"participants":["Michael Litwak"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"486730","messageId":"SJ0PR10MB569341D4236E1438E49EA1D9FA6F2@SJ0PR10MB5693.namprd10.prod.outlook.com","threadId":"60737","inReplyTo":null,"subject":"Re: help request: unable to merge UTF-16-LE \"text\" file","fromName":"Michael Litwak","fromEmail":"michael.litwak@nuix.com","sentAt":"2024-01-12T20:34:28Z","receivedAt":"2024-01-12T20:34:39Z","isPatch":false,"sender":{"key":"michael.litwak@nuix.com","avatar":null},"body":"\nThis is in reply to the message at \nhttps://lore.kernel.org/all/20220422184211.5z67sxrgq2zm3tvd@compass/#t\n\nSent via MS Outlook - hope this reaches the online thread.\n\n------------------------------------------------------------------------\n\nOn Windows, if you do\n\n    git add\n\nfrom an ordinary Command Prompt, it will fail to call iconv.exe to perform\nthe necessary text conversion.  I.E. your UTF-16LE with BOM file will not be\nproperly converted by Git to UTF-8 for its internal storage, leading to\nsubsequent encoding errors.\n\nSo, in addition to setting the working-tree-encoding of the file to \nUTF-16LE-BOM in .gitattributes prior to adding the file, be sure to run:\n\n    git add   \n\nfrom a git bash console when adding such files.\n\n- Michael\n\n"}]}