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. 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. On Wed, Apr 20, 2022 at 10:26 AM Erik Cervin Edin <erik@xxxxxxxxxxx> wrote: > > On Wed, Apr 20, 2022 at 6:29 PM Kevin Long <kevinlong206@xxxxxxxxx> 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
