Merge Conflict See documentation. Notice This is a an extension that is bundled with Visual Studio Code.