add message & sort supress keys

Author: sergiolms

package.json

@@ -4563,22 +4563,23 @@
 					"gitlens.advanced.messages": {
 						"type": "object",
 						"default": {
+							"suppressBlameInvalidIgnoreRevsFileBadRevisionWarning": false,
+							"suppressBlameInvalidIgnoreRevsFileWarning": false,
 							"suppressCommitHasNoPreviousCommitWarning": false,
 							"suppressCommitNotFoundWarning": false,
 							"suppressCreatePullRequestPrompt": false,
 							"suppressDebugLoggingWarning": false,
 							"suppressFileNotUnderSourceControlWarning": false,
+							"suppressGitBranchNotFullyMergedWarning": false,
 							"suppressGitDisabledWarning": false,
 							"suppressGitMissingWarning": false,
 							"suppressGitVersionWarning": false,
-							"suppressLineUncommittedWarning": false,
-							"suppressNoRepositoryWarning": false,
-							"suppressRebaseSwitchToTextWarning": false,
 							"suppressIntegrationDisconnectedTooManyFailedRequestsWarning": false,
 							"suppressIntegrationRequestFailed500Warning": false,
 							"suppressIntegrationRequestTimedOutWarning": false,
-							"suppressBlameInvalidIgnoreRevsFileWarning": false,
-							"suppressBlameInvalidIgnoreRevsFileBadRevisionWarning": false
+							"suppressLineUncommittedWarning": false,
+							"suppressNoRepositoryWarning": false,
+							"suppressRebaseSwitchToTextWarning": false
 						},
 						"properties": {
 							"suppressCommitHasNoPreviousCommitWarning": {

src/config.ts

@@ -575,25 +575,26 @@ export interface RemotesUrlsConfig {
 
 // NOTE: Must be kept in sync with `gitlens.advanced.messages` setting in the package.json
 export type SuppressedMessages =
+	| 'suppressBlameInvalidIgnoreRevsFileBadRevisionWarning'
+	| 'suppressBlameInvalidIgnoreRevsFileWarning'
 	| 'suppressCommitHasNoPreviousCommitWarning'
 	| 'suppressCommitNotFoundWarning'
 	| 'suppressCreatePullRequestPrompt'
 	| 'suppressDebugLoggingWarning'
 	| 'suppressFileNotUnderSourceControlWarning'
+	| 'suppressGitBranchNotFullyMergedWarning'
 	| 'suppressGitDisabledWarning'
 	| 'suppressGitMissingWarning'
 	| 'suppressGitVersionWarning'
-	| 'suppressLineUncommittedWarning'
-	| 'suppressNoRepositoryWarning'
-	| 'suppressRebaseSwitchToTextWarning'
 	| 'suppressGkDisconnectedTooManyFailedRequestsWarningMessage'
 	| 'suppressGkRequestFailed500Warning'
 	| 'suppressGkRequestTimedOutWarning'
 	| 'suppressIntegrationDisconnectedTooManyFailedRequestsWarning'
 	| 'suppressIntegrationRequestFailed500Warning'
 	| 'suppressIntegrationRequestTimedOutWarning'
-	| 'suppressBlameInvalidIgnoreRevsFileWarning'
-	| 'suppressBlameInvalidIgnoreRevsFileBadRevisionWarning';
+	| 'suppressLineUncommittedWarning'
+	| 'suppressNoRepositoryWarning'
+	| 'suppressRebaseSwitchToTextWarning';
 
 export interface ViewsCommonConfig {
 	readonly collapseWorktreesWhenPossible: boolean;

src/messages.ts

@@ -137,6 +137,18 @@ export function showGitVersionUnsupportedErrorMessage(
 	);
 }
 
+export async function showGitBranchNotFullyMergedPrompt(branchName: string): Promise<MessageItem | undefined> {
+	const confirm = { title: 'Retry with --force flag' };
+	const result = await showMessage(
+		'warn',
+		`Unable to delete branch '${branchName}'. It is not fully merged.`,
+		'suppressGitBranchNotFullyMergedWarning',
+		{ title: "Don't Show Again" },
+		confirm,
+	);
+	return result === confirm;
+}
+
 export function showPreReleaseExpiredErrorMessage(version: string) {
 	return showMessage(
 		'error',