Why can't I resolve this source conflict in VS 2019?

Question

There don't appear to be any useful options here to resolve this merge from dev -> main branches. Why? I just want to overwrite whoever changed the main branch incorrectly, but I don't have any option to do that here.

If I right click, I see some options but none of them are useful:

Answer 1

EDIT:

Microsoft released a fix for this issue, you need to install the recent release from: https://visualstudio.microsoft.com/downloads.

---

It's a known issue in Visual Studio 2019, you can read the thread here.

The official Microsoft solution is:

We have identified the problem and are preparing a fix. Until the fix can be released, here are a few potential workarounds that may help unblock you.

1. Launch TFVC operations that may trigger conflict resolution (ex: Get Latest) from Source Control Explorer rather than Solution Explorer. In our testing, the bug repros less frequently from Source Control Explorer entrypoints.

2. Try disabling the "Optimize rendering for screens with different pixel densities" option in Tools->Options->Environment->General.

Another workaround you can try is:

Inside the "Developer Command Prompt for VS2019", type the command:

tf resolve

This will open (from what it looks like) the same window as the one within VS2019, without styling, but the Merge buttons will are present and usable.

When you are done resolving the conflicts in this window, close it and refresh the merge conflict window inside VS2019 to ensure that VS sees the changes.