From: Junio C Hamano <gitster@pobox.com>
To: Erik Cervin Edin <erik@cervined.in>
Cc: Kevin Long <kevinlong206@gmail.com>, git@vger.kernel.org
Subject: Re: help request: unable to merge UTF-16-LE "text" file
Date: Wed, 20 Apr 2022 10:50:42 -0700 [thread overview]
Message-ID: <xmqq8rrzr6dp.fsf@gitster.g> (raw)
In-Reply-To: <CA+JQ7M8+FR+_t+Fafoggz47bT0joAZFEkjhjf72teZgdNEoNZQ@mail.gmail.com> (Erik Cervin Edin's message of "Wed, 20 Apr 2022 19:25:42 +0200")
Erik Cervin Edin <erik@cervined.in> writes:
> 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.
next prev parent reply other threads:[~2022-04-20 17:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 19:36 help request: unable to merge UTF-16-LE "text" file Kevin Long
2022-04-19 21:50 ` brian m. carlson
2022-04-20 17:25 ` Erik Cervin Edin
2022-04-20 17:38 ` Kevin Long
2022-04-20 17:50 ` Junio C Hamano [this message]
2022-04-20 17:55 ` Erik Cervin Edin
2022-04-20 18:03 ` Erik Cervin Edin
2022-04-24 1:57 ` Chris Torek
2022-04-22 18:42 ` Plato Kiorpelidis
-- strict thread matches above, loose matches on Subject: below --
2024-01-12 20:34 Michael Litwak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8rrzr6dp.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=erik@cervined.in \
--cc=git@vger.kernel.org \
--cc=kevinlong206@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).