From 2e339afec3cd1ad4d9ee1e622e3d35045fd4a545 Mon Sep 17 00:00:00 2001 From: laphets Date: Thu, 8 Nov 2018 23:35:22 +0800 Subject: [PATCH] Fix last merge conflict warnings --- extensions/merge-conflict/src/commandHandler.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts index a736080896c..53cea762e6e 100644 --- a/extensions/merge-conflict/src/commandHandler.ts +++ b/extensions/merge-conflict/src/commandHandler.ts @@ -158,6 +158,11 @@ export default class CommandHandler implements vscode.Disposable { let navigationResult = await this.findConflictForNavigation(editor, direction); if (!navigationResult) { + // Check for autoNavigateNextConflict, if it's enabled(which indicating no conflict remain), then do not show warning + const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict'); + if (mergeConflictConfig.get('autoNavigateNextConflict.enabled')) { + return; + } vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file')); return; }