Skip to content

Commit

Permalink
Added git settings for branch name suggestion, protection, pull, and …
Browse files Browse the repository at this point in the history
…mergeEditor (#21954)

VS Code repository, specifically in the .vscode/settings.json, has some
nice git features such as:
Issue: #21955
"git.branchRandomName.enable" (for suggesting random branch name when
creating a new branch, comes in very handy when person wants to make and
try quick changes in Codespaces),
"git.branchProtection" (for branch protection), 
"git.pullBeforeCheckout": (for pulling before checking out a branch), 
"git.mergeEditor": (for making easier when in times of resolving merge
conflicts)

which I found could be useful to the Python extension repository as
well.

Credits to @karrtikr for suggesting random name, and branch protection.
  • Loading branch information
anthonykim1 authored Sep 9, 2023
1 parent 7196a36 commit 30c83a3
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,14 @@
"--max-line-length=88"
],
"typescript.preferences.importModuleSpecifier": "relative",
"debug.javascript.usePreview": false
"debug.javascript.usePreview": false,
// Branch name suggestion.
"git.branchRandomName.enable": true,
"git.branchProtection": [
"main",
"release/*"
],
"git.pullBeforeCheckout": true,
// Open merge editor for resolving conflicts.
"git.mergeEditor": true,
}

0 comments on commit 30c83a3

Please sign in to comment.