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
PKPlato Kiorpelidis <kioplato@gmail.com>
Date
Apr 22, 2022, 18:42 UTC
Message-ID
<20220422184211.5z67sxrgq2zm3tvd@compass>
In-Reply-To
<CAJCZ4U-9KYGK0jwnL1GyOYW-CMjV_Eo--g85CbexsV=aQnn7aw@mail.gmail.com>
On 22/04/19 12:36PM, Kevin Long wrote:
> Greetings,
Hey Kevin,
> [..]

It would also help if you create a minimal working example[1] and upload it to a popular Git hosting service like Github/Gitlab, so we can try to perform the merge. This way, you will probably get more precise directions.

[1]: https://en.wikipedia.org/wiki/Minimal_reproducible_example

Thanks, Plato

Previous: Chris Torek
Message 9 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.