Add option to pull target branch automatically after squash merge (#7812)

* Initial plan

* Initial exploration and planning

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Add postDone setting to control post-merge branch behavior

* Clarify setting

* Changes before error encountered

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* nits

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

package.json

@@ -444,6 +444,19 @@
 						"%githubPullRequests.postCreate.checkoutDefaultBranchAndCopy%"
 					]
 				},
+				"githubPullRequests.postDone": {
+					"type": "string",
+					"enum": [
+						"checkoutDefaultBranch",
+						"checkoutDefaultBranchAndPull"
+					],
+					"description": "%githubPullRequests.postDone.description%",
+					"default": "checkoutDefaultBranch",
+					"enumDescriptions": [
+						"%githubPullRequests.postDone.checkoutDefaultBranch%",
+						"%githubPullRequests.postDone.checkoutDefaultBranchAndPull%"
+					]
+				},
 				"githubPullRequests.defaultCommentType": {
 					"type": "string",
 					"enum": [

package.nls.json

@@ -76,6 +76,9 @@
 	"githubPullRequests.postCreate.checkoutDefaultBranch": "Checkout the default branch of the repository",
 	"githubPullRequests.postCreate.checkoutDefaultBranchAndShow": "Checkout the default branch of the repository and show the pull request in the Pull Requests view",
 	"githubPullRequests.postCreate.checkoutDefaultBranchAndCopy": "Checkout the default branch of the repository and copy a link to the pull request to the clipboard",
+	"githubPullRequests.postDone.description": "The action to take after using the 'checkout default branch' or 'delete branch' actions on a currently checked out pull request.",
+	"githubPullRequests.postDone.checkoutDefaultBranch": "Checkout the default branch of the repository",
+	"githubPullRequests.postDone.checkoutDefaultBranchAndPull": "Checkout the default branch of the repository and pull the latest changes",
 	"githubPullRequests.defaultCommentType.description": "The default comment type to use when submitting a comment and there is no active review",
 	"githubPullRequests.defaultCommentType.single": "Submits the comment as a single comment that will be immediately visible to other users",
 	"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

@@ -18,6 +18,7 @@ export const PULL_BRANCH = 'pullBranch';
 export const PULL_REQUEST_DESCRIPTION = 'pullRequestDescription';
 export const NOTIFICATION_SETTING = 'notifications';
 export const POST_CREATE = 'postCreate';
+export const POST_DONE = 'postDone';
 export const QUERIES = 'queries';
 export const PULL_REQUEST_LABELS = 'labelCreated';
 export const FOCUSED_MODE = 'focusedMode';