Not Seeing File Merge Conflicts in VSCode - Insiders

[conradwt]

I'm not seeing file merge conflicts in VSCode - Insiders. At this time, it only shows me the following screen:

Does this issue occur when all extensions are disabled?: No, this functionality is completely broken and I can't even get to the above screen.

• VS Code Version: Version: 1.76.0-insider (Universal)
• OS Version: macOS 12.6.2

Steps to Reproduce:

1. create a feature branch
2. make some changes
3. commit changes
4. push changes
5. create PR
6. See the image above

[conradwt]

Here's an example PR that has conflicts but I'm not seeing a way to resolve them within VSCode.

conradwt/rumbl#8

Are there any updates on the issue?

[lszomoru]

@alexr00, could you please take a look at this one? Thank you!

[alexr00]

Duplicate of #1562