Erik Cervin Edin <erik@xxxxxxxxxxx> writes: > 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 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.
