This repository has been archived on 2026-07-08. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
azuredatastudio/extensions/merge-conflict

Merge Conflict

Notice: This extension is bundled with Azure Data Studio. It can be disabled but not uninstalled.

Features

See Merge Conflicts to learn about features of this extension.