Visual Studio Code – How to disable/turn off 3-way merge editor view in VSCode?
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: source However, from v1.70 onwards, it's been updated. See…