Total downloads
341,966
vscode.merge-conflict
Merge Conflict (built-in)
7d gain
1,422
Rolling weekly delta
Rating
-
/ 5
0 reviews
Version
1.95.3
Latest published
Activity
Extension trends
Manifest
Metadata
- Namespace
- vscode
- Name
- merge-conflict
- License
- SEE LICENSE IN LICENSE-vscode.txt
- Homepage
- https://github.com/eclipse-theia/vscode-builtin-extensions#readme
- Repository
- https://github.com/eclipse-theia/vscode-builtin-extensions.git
- Reviews
- 0
Taxonomy
Categories
Description
Highlighting and commands for inline merge conflicts.
Archive
Release history
- 1.95.3 2024-12-10
- 1.88.1 2024-05-02
- 1.83.1 2024-01-21
- 1.79.0 2023-08-07
- 1.77.0 2023-05-26
- 1.70.2 2023-03-10
- 1.66.2 2023-01-25
- 1.64.2 2022-12-16
- 1.64.0-next.d9fa2b12136 2021-12-09
- 1.64.0-next.452e2c53030 2021-12-09
- 1.64.0-next.68976705968 2021-12-09
- 1.53.2-next.622cb03f7e0 2021-12-08
- 1.63.0-next.77e1ce431a9 2021-12-08
- 1.63.0-next.2a6a8c59b31 2021-12-08
- 1.63.0-next.974442023a6 2021-12-07
- 1.63.0-next.d09289a2b6d 2021-12-04
- 1.63.0-next.cca3e817a26 2021-12-03
- 1.63.0-next.9d674adf0ae 2021-12-02
- 1.63.0-next.0cc0904c565 2021-12-01
- 1.63.0-next.db95d3c179e 2021-11-30
- 1.63.0-next.273bdea9e7f 2021-11-29
- 1.63.0-next.d3a5e09ad25 2021-11-28
- 1.63.0-next.7dfcd74e634 2021-11-27
- 1.63.0-next.a45c7f09cc9 2021-11-26
- 1.63.0-next.9ec1ae1d927 2021-11-25