Re: help request: unable to merge UTF-16-LE "text" file
On Wed, Apr 20, 2022 at 7:50 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
>
> 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.
Hmm.. Right, the common ancestor would still be the old encoding :/
On Wed, Apr 20, 2022 at 7:38 PM Kevin Long <kevinlong206@gmail.com> wrote:
>
> Thanks, I actually did try that without success. I'm wondering if
> there is an "ancestor" object that is still binary or something, deep
> rooted in the tree.
Yes, as Junio correctly pointed out.
> Converting it once and for all to utf-8 would be great, as that will
> work fine with Visual Studio. Not sure why the original committer
> chose UTF-16.
Visual Studio probably saved it as utf-16le with BOM :(
Show 6 quoted lines
> I have tried several "working-tree-encoding" settings in
> .gitattributes in my local working directory, to no avail yet:
>
> *.sln working-tree-encoding=UTF-16-LE eol=CRLF, results in:
> error: failed to encode 'FacilityMaster.sln' from UTF-16-LE to UTF-8
> warning: Cannot merge binary files: FacilityMaster.sln (HEAD vs. master)
Could the issue be that it should be UTF-16LE (without hyphen)?