Skip to content

Commit de232e0

Browse files
committed
Add postDone setting to control post-merge branch behavior
1 parent daca28c commit de232e0

File tree

4 files changed

+2986
-2943
lines changed

4 files changed

+2986
-2943
lines changed

package.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,19 @@
444444
"%githubPullRequests.postCreate.checkoutDefaultBranchAndCopy%"
445445
]
446446
},
447+
"githubPullRequests.postDone": {
448+
"type": "string",
449+
"enum": [
450+
"checkoutDefaultBranch",
451+
"checkoutDefaultBranchAndPull"
452+
],
453+
"description": "%githubPullRequests.postDone.description%",
454+
"default": "checkoutDefaultBranch",
455+
"enumDescriptions": [
456+
"%githubPullRequests.postDone.checkoutDefaultBranch%",
457+
"%githubPullRequests.postDone.checkoutDefaultBranchAndPull%"
458+
]
459+
},
447460
"githubPullRequests.defaultCommentType": {
448461
"type": "string",
449462
"enum": [

package.nls.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
"githubPullRequests.postCreate.checkoutDefaultBranch": "Checkout the default branch of the repository",
7777
"githubPullRequests.postCreate.checkoutDefaultBranchAndShow": "Checkout the default branch of the repository and show the pull request in the Pull Requests view",
7878
"githubPullRequests.postCreate.checkoutDefaultBranchAndCopy": "Checkout the default branch of the repository and copy a link to the pull request to the clipboard",
79+
"githubPullRequests.postDone.description": "The action to take after completing a pull request (merge/delete branches).",
80+
"githubPullRequests.postDone.checkoutDefaultBranch": "Checkout the default branch of the repository",
81+
"githubPullRequests.postDone.checkoutDefaultBranchAndPull": "Checkout the default branch of the repository and pull the latest changes",
7982
"githubPullRequests.defaultCommentType.description": "The default comment type to use when submitting a comment and there is no active review",
8083
"githubPullRequests.defaultCommentType.single": "Submits the comment as a single comment that will be immediately visible to other users",
8184
"githubPullRequests.defaultCommentType.review": "Submits the comment as a review comment that will be visible to other users once the review is submitted",

src/common/settingKeys.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const PULL_BRANCH = 'pullBranch';
1818
export const PULL_REQUEST_DESCRIPTION = 'pullRequestDescription';
1919
export const NOTIFICATION_SETTING = 'notifications';
2020
export const POST_CREATE = 'postCreate';
21+
export const POST_DONE = 'postDone';
2122
export const QUERIES = 'queries';
2223
export const PULL_REQUEST_LABELS = 'labelCreated';
2324
export const FOCUSED_MODE = 'focusedMode';

0 commit comments

Comments
 (0)