COMMITS
/ extensions/merge-conflict/package.json February 13, 2026
M
Esbuild a few more built-in extensions
Matt Bierner committed
February 12, 2026
R
chore: bump extension versions (#295040)
Raymond Zhao committed
May 9, 2025
R
chore: update to Electron 35 (#245423)
Robo committed
December 17, 2024
L
Update telemetry package (#236378)
Logan Ramos committed
May 10, 2024
R
chore: update to electron 29 (#209818)
Robo committed
November 1, 2023
L
Bump telemetry package (#197168)
Logan Ramos committed
September 20, 2023
L
Fix slow telemetry module (#193607)
Logan Ramos committed
August 24, 2023
L
Bump extension telemetry module (#191237)
Logan Ramos committed
August 7, 2023
R
chore: update to Electron 25 (#188268)
Robo committed
February 6, 2023
L
Bump module to new package (#173599)
Logan Ramos committed
January 23, 2023
L
Remove unused proposals (#172035)
Logan Ramos committed
January 3, 2023
L
Update the telemetry modules (#170512)
Logan Ramos committed
December 15, 2022
L
Bump telemetry packages (#169283)
Logan Ramos committed
November 28, 2022
H
Add telemetry for conflict markers
Henning Dieterichs committed
November 4, 2022
M
Adopt l10n for merge-conflict (#165531)
Matt Bierner committed
September 26, 2022
T
rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#161819)
Tyler James Leonhardt committed
September 20, 2022
J
Disable merge-conflict commands for 3wm-editor (#161304)
Johannes Rieken committed
August 8, 2022
T
Rev built-in versions of vscode-nls to 5.1.0 (#157530)
Tyler James Leonhardt committed
July 7, 2022
L
Switch extensions to 1DS (#154299)
Logan Ramos committed
June 24, 2022
J
joh/careful silverfish (#153089)
Johannes Rieken committed
March 10, 2022
R
chore: update to electron 17 (#143223)
Robo committed
February 24, 2022
R
chore: revert to electron@13 (#143851)
Robo committed
February 8, 2022
R
chore: update to electron 16 (#137241)
Robo committed
J
Enable merge-conflict extension in virtual workspaces (fixes #142447)
Joyce Er committed
July 8, 2021
M
adopt web extensions to webpack 5
Martin Aeschlimann committed
May 4, 2021
R
chore: bump [email protected] in devDependencies (#122905)
Robo committed
April 22, 2021
S
adopt virtual workspaces - not supported
Sandeep Somavarapu committed
April 21, 2021
S
update ext manifest schema validation and built-in exts
SteVen Batten committed
April 20, 2021
M
Add icons for built-in extensions (fixes #81760)
Miguel Solorio committed
April 13, 2021
C
Adopt workspaceTrust
Christof Marti committed
March 31, 2021
C
Add next/prev conflicts (#97613)
Christof Marti committed
W
Add next/prev conflicts (#97613)
Wenlu Wang committed
January 29, 2021
J
add repository field to extensions package.json
João Moreno committed
January 12, 2021
C
Activate onStartupFinished (#110031)
Christof Marti committed
December 18, 2020
A
Align `@types/*` dev dependencies (#112718)
Alexandru Dima committed
June 26, 2020
M
fix merge-conflict browser main
Martin Aeschlimann committed
M
fix merge-conflict for browser
Martin Aeschlimann committed
June 25, 2020
M
used shared webpack-config for browser
Martin Aeschlimann committed
June 12, 2020
M
make merge-conflic serverless
Martin Aeschlimann committed
October 28, 2019
B
debt - bump node.d.ts dependency in extensions to 12.x (part of #82514)
Benjamin Pasero committed
June 6, 2019
A
Add License field to package.jsons #68423 (#68771)
Aurélien Pupier committed
June 5, 2019
B
update @types/node (#74881)
Benjamin Pasero committed
B
debt - use @types/node: 10 for all extensions
Benjamin Pasero committed
May 28, 2019
M
Add enumDescriptions for merge-conflict.diffViewPosition
Matt Bierner committed
May 24, 2019
P
Open the diff view in current editor, to the side or below.
Peng Lyu committed
P
Always compare change with context.
Peng Lyu committed
P
Support open diff in new editor group
Peng Lyu committed
May 23, 2019
P
Show context for diff view of merge conflict and introduce compareAll.
Peng Lyu committed
October 2, 2018
C
Off by default (#45853)
Christof Marti committed
C
Merge branch 'master' into Issue-#45853-checked
Christof Marti committed