louis_lifu
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Robo 12326f9906
chore: update to Electron 35 (#245423) 
* chore: bump electron@35.0.1

* chore: update types/node@22.x

* chore: update web types for node v22.x

* chore: bump electron@35.1.2

* chore: update node.js build

* chore: update app.dock usage

Refs 71f3ff6bf2

* chore: bump electron@35.1.4

* chore: bump electron@35.1.5

* ci: bump sysroot to glibc 2.28 and gcc 10.5.0

* ci: enable timeout for smoketests

* chore: bump min glibcxx to 3.4.26 for server

* Revert "ci: enable timeout for smoketests"

This reverts commit afb637e85d.

* chore: update debian dependencies

* fix: workaround npm.ps1 argument parsing with powershell

* chore: update rpm dependencies

* test: partially revert changes from 242535

* test: remove redudant keybinding dispatch for selectTab

* test: fix test failure from running configured tasks

* test: focus settings editor for preferences.test.ts

* node - adopt compile cache (#246835)

* node - adopt compile cache

* adopt for utility process

* tweaks

* log state of compilation cache

* Revert "log state of compilation cache"

This reverts commit f3840387a583013834762e2c44f6e8424929297f.

* Revert "node - adopt compile cache (#246835)"

This reverts commit 673a00cab66c9bac87f3cd27b80efa41c80150f1.

* chore: update builds

* chore: bump electron@35.2.0

* chore: bump electron@35.2.1

* chore: bump electron@35.2.2

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
 		2025-05-09 19:03:36 +09:00
..
media Add icons for built-in extensions (fixes #81760) 2021-04-20 12:09:24 -07:00
src Fixes flashing of inline conflict marker code lenses (#168598) 2022-12-09 15:16:55 +01:00
.npmrc chore: add npmrc to extensions folder (#230214) 2024-10-01 12:43:01 +02:00
.vscodeignore chore: rm unreached ignore items when build extensions. (#227906) 2024-09-09 10:32:51 +00:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
extension-browser.webpack.config.js used shared webpack-config for browser 2020-06-25 23:22:02 +02:00
extension.webpack.config.js make merge-conflic serverless 2020-06-12 11:03:52 +02:00
package-lock.json chore: update to Electron 35 (#245423) 2025-05-09 19:03:36 +09:00
package.json chore: update to Electron 35 (#245423) 2025-05-09 19:03:36 +09:00
package.nls.json CodeLens should be one word 2020-04-03 13:46:00 -07:00
tsconfig.json use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files 2021-11-09 15:53:35 +01:00

README.md

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 to learn about features of this extension.