File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -879,7 +879,12 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
879879 const deleteBranchAfterMerge = vscode . workspace . getConfiguration ( PR_SETTINGS_NAMESPACE ) . get < boolean > ( DELETE_BRANCH_AFTER_MERGE , false ) ;
880880 if ( deleteBranchAfterMerge && result ) {
881881 // For merge queues, only delete the local branch since the PR isn't merged yet
882- await PullRequestReviewCommon . autoDeleteLocalBranchAfterEnqueue ( this . _folderRepositoryManager , this . _item ) ;
882+ try {
883+ await PullRequestReviewCommon . autoDeleteLocalBranchAfterEnqueue ( this . _folderRepositoryManager , this . _item ) ;
884+ } catch ( e ) {
885+ Logger . appendLine ( `Auto-delete local branch after enqueue failed: ${ formatError ( e ) } ` , PullRequestOverviewPanel . ID ) ;
886+ void vscode . window . showWarningMessage ( vscode . l10n . t ( 'Auto-deleting the local branch after enqueueing to the merge queue failed.' ) ) ;
887+ }
883888 }
884889
885890 this . _replyMessage ( message , { mergeQueueEntry : result } ) ;
You can’t perform that action at this time.
0 commit comments