File size: 286 Bytes
0a0c420 | 1 2 3 4 5 6 7 8 | # Merge Conflict
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
## Features
See [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.
|