If you haven't already, grab the June 2022 Release of VS Code! If you're on Insiders, then there's nothing you need to do.
There are all kinds of goodies in the release, but this week's tip is a new feature that landed in VS Code. The 3-way Merge Editor. 🔥