daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix last merge conflict warnings

pull/64075/head
laphets 2018-11-08 23:35:22 +08:00 committed by Christof Marti
parent d215718700
commit 2e339afec3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/merge-conflict/src/commandHandler.ts
View File

@ -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<boolean>('autoNavigateNextConflict.enabled')) {
return;
}
vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file'));
return;
}