2018-02-26 16:48:26 +08:00
|
|
|
# Merge Conflict
|
|
|
|
|
|
2018-07-14 06:28:27 +08:00
|
|
|
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
|
2018-03-02 18:18:31 +08:00
|
|
|
|
2018-07-12 07:38:12 +08:00
|
|
|
## Features
|
|
|
|
|
|
2018-07-14 06:28:27 +08:00
|
|
|
See [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.
|
