git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 20, 2022, 17:50 UTC
Message-ID
<xmqq8rrzr6dp.fsf@gitster.g>
In-Reply-To
<CA+JQ7M8+FR+_t+Fafoggz47bT0joAZFEkjhjf72teZgdNEoNZQ@mail.gmail.com>
Erik Cervin Edin <erik@cervined.in> writes:
Show 7 quoted lines
> On Wed, Apr 20, 2022 at 6:29 PM Kevin Long <kevinlong206@gmail.com> wrote:
>>
>> The problem file is a .sln file (Visual Studio "solution"). Edited in
>> both branches. It is a "text" file, but is encoded as such:
>
> Can you convert it to utf-8 in both branches and then merge?
>   iconv.exe -f utf-16le -t utf-8 foo.sln > tmp.sln && mv -f tmp.sln foo.sln

For that to work, it is likely that you'd need to convert not just the tips of two branches getting merged, but also the merge base commit, so that all three trees involved in the 3-way merge are in the same text encoding.

Previous: Kevin LongNext: Erik Cervin Edin
Message 5 of 9 in “help request: unable to merge UTF-16-LE "text" file”
  1. Kevin LongApr 19, 2022
  2. brian m. carlsonApr 19, 2022
  3. Erik Cervin EdinApr 20, 2022
  4. Kevin LongApr 20, 2022
  5. Junio C HamanoApr 20, 2022
  6. Erik Cervin EdinApr 20, 2022
  7. Erik Cervin EdinApr 20, 2022
  8. Chris TorekApr 24, 2022
  9. Plato KiorpelidisApr 22, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.