RT Henning Dieterichs
You got a merge conflict in @code? Share it with me and I'll try to help you solving it 😉 Every shared conflict helps us to optimize the new merge editor in VS Code!
Just open the merge editor, use the command "Copy Merge Editor State As JSON" and share the output with me

https://twitter.com/hediet_dev/status/1577240536854892544