Hang on merge conflicts

[xiaomi7732]

• VS Code Version:

Version: 1.71.0
Commit: 784b0177c56c607789f9638da7b6bf3230d47a8c
Date: 2022-09-01T07:36:10.600Z
Electron: 19.0.12
Chromium: 102.0.5005.167
Node.js: 16.14.2
V8: 10.2.154.15-electron.0
OS: Windows_NT x64 10.0.22000
Sandboxed: No

• OS Version:
  Windows 11.

Steps to Reproduce:

1. Open and try to merge conflicts. Only hang for this specific one:
   
2. Not repro in Visual Studio:
   

Conflict

Incoming:
https://github.com/xiaomi7732/ApplicationInsights-Kubernetes/blob/f00d06cc228dace35adc1f2f7c806361a292fa5e/src/ApplicationInsights.Kubernetes/Extensions/KubernetesServiceCollectionBuilder.cs

Current:
https://github.com/microsoft/ApplicationInsights-Kubernetes/blob/faf5ef526fa432caab6926b336aaffc6b299a5d4/src/ApplicationInsights.Kubernetes/Extensions/KubernetesServiceCollectionBuilder.cs

[xiaomi7732]

Hi there, it has been a while, is there any update to this?

For people ran into the same problem, a work around is to disable the new merge editor:

"git.mergeEditor": false

[hediet]

Thanks for the bug report! Can you share the base version of that conflict?

[xiaomi7732]

Sorry, what do you mean by the base version of the conflict? I am trying to merge Incoming into Current (both provided), what's the difference between base and the current? Thanks.

[hediet]

Base is the common ancestor file of both commits.

[xiaomi7732]

I see. I am not 100% sure this is accurate, but this is my best bet for the base:
https://github.com/xiaomi7732/ApplicationInsights-Kubernetes/blob/6b19fd5f414dbc8653a3b8ab445c6576d186575f/src/ApplicationInsights.Kubernetes/Extensions/KubernetesServiceCollectionBuilder.cs#L1