I'm using VS 2019 and working with an ASP.NET MVC project.
I got merge conflicts that had to be resolved manually. The problem is that the button for “Merge changes in merge tool” at the top of the VS editor - is not shown.
I've seen this issue happened since 2019 and it seems that it still doesn't fix it completely...
Also inconvenient when met with the same issue.
You can try below method:
Open vs 2019 (The specific vs 2019 version used: Visual Studio Professional 2019 Version 16.10.0):
Menu -> Git -> Settings =>
Source control -> Git Global Settings -> "Tools"
Click "Visual studio" for the option of "Diff Tool" and "Merge tool" respectively.
May it be helpful for you. Just enjoy!
You can fix this issue by un-check the optimize rendering for screens with different pixel densities.
Go Tools --> Options and in General tab of Environment section and un-check the second item.
Based on this, it seems that this issue has been fixed in latest version.
