Merge pull request #47886 from andrewtomai/Issue-#45853-checked

Fix #45853 

extensions/merge-conflict/package.json

@@ -109,6 +109,11 @@
           "type": "boolean",
           "description": "%config.decoratorsEnabled%",
           "default": true
+        },
+        "merge-conflict.autoNavigateNextConflict.enabled": {
+          "type": "boolean",
+          "description": "%config.autoNavigateNextConflictEnabled%",
+          "default": true
         }
       }
     }

extensions/merge-conflict/package.nls.json

@@ -13,6 +13,7 @@
 	"command.previous": "Previous Conflict",
 	"command.compare": "Compare Current Conflict",
 	"config.title": "Merge Conflict",
+	"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
 	"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
 	"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor."
 }
\ No newline at end of file

extensions/merge-conflict/src/commandHandler.ts

@@ -196,6 +196,13 @@ export default class CommandHandler implements vscode.Disposable {
 		// Tracker can forget as we know we are going to do an edit
 		this.tracker.forget(editor.document);
 		conflict.commitEdit(type, editor);
+
+		// navigate to the next merge conflict
+		const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
+		if (mergeConflictConfig.get<boolean>('autoNavigateNextConflict.enabled')) {
+			this.navigateNext(editor);
+		}
+
 	}
 
 	private async acceptAll(type: interfaces.CommitType, editor: vscode.TextEditor): Promise<void> {