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
EEErik Cervin Edin <erik@cervined.in>
Date
Apr 20, 2022, 18:03 UTC
Message-ID
<CA+JQ7M_Q_Qkh=+qziKg379e_xywQn2RBeAPNx29Dw6a5RXkY1A@mail.gmail.com>
In-Reply-To
<CA+JQ7M9o+kZUgLkCq7aauCUwzZy6OzwKpyGQ1DxQyaL2jkJBSg@mail.gmail.com>
On Wed, Apr 20, 2022 at 6:29 PM Kevin Long <kevinlong206@gmail.com> wrote:
>
> Hoping for some suggestions. I've also tried to save the file as UTF-8
> in both branches, commit, then merge, but still that did not work. I
> just want to merge it like a normal source code file.

Solution files tend to be of the "for machines only" variety. In my experience, it often ends up being a bunch of csproj GUIDs changing back and forth. Consider just taking one of the two and manually fixing the solution file?

Previous: Erik Cervin EdinNext: Chris Torek
Message 7 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.