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

See documentation.

Notice This is a an extension that is bundled with SQL Operations Studio.