Until recently, in VSCode, handling merge conflicts was simple (to me, at least):

• Accept Current Change,
• Accept Incoming Change,
• Accept Both Changes,
• Compare Changes.

It used to be something like this:

CodePudding user response：

As I undestand you need to disable git.mergeEditor in your user settings

https://dev.to/vscodetips/vs-code-tip-of-the-week-3-way-merge-editor-416h