development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable merge editor for the team

Browse source
This commit is contained in:
Johannes 2022-06-27 12:55:05 +02:00
parent aae22c1605
commit 7c78e2ea8e
No known key found for this signature in database
GPG key ID: 6DEF802A22264FCA
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.vscode/settings.json vendored
View file

@ -73,6 +73,7 @@
],
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
"git.branchRandomName.enable": true,
"git.mergeEditor": true,
"remote.extensionKind": {
"msjsdiag.debugger-for-chrome": "workspace"
},