On the same day as that announcement, VS Code v1.69 (June 2022 update) arrived, with these highlights: 3-way merge editor - Resolve merge conflicts within VS Code: Work continued on this functionality ...