mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-10 02:02:35 -05:00
6 lines
193 B
Markdown
6 lines
193 B
Markdown
# Merge Conflict
|
|
|
|
See [documentation](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts).
|
|
|
|
**Notice** This is a an extension that is bundled with SQL Operations Studio.
|