On Wed, Apr 20, 2022 at 6:29 PM Kevin Long <kevinlong206@xxxxxxxxx> wrote: > > Hoping for some suggestions. I've also tried to save the file as UTF-8 > in both branches, commit, then merge, but still that did not work. I > just want to merge it like a normal source code file. Solution files tend to be of the "for machines only" variety. In my experience, it often ends up being a bunch of csproj GUIDs changing back and forth. Consider just taking one of the two and manually fixing the solution file?
