mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
Accept merge with conflicts dialog (fix #162296)
This commit is contained in:
parent
bcb6c9b7e0
commit
a17bc4853e
|
@ -4,6 +4,7 @@
|
|||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { Codicon } from 'vs/base/common/codicons';
|
||||
import { basename } from 'vs/base/common/resources';
|
||||
import { URI, UriComponents } from 'vs/base/common/uri';
|
||||
import { localize } from 'vs/nls';
|
||||
import { ILocalizedString } from 'vs/platform/action/common/action';
|
||||
|
@ -632,8 +633,9 @@ export class AcceptMerge extends MergeEditorAction2 {
|
|||
if (viewModel.model.unhandledConflictsCount.get() > 0) {
|
||||
const confirmResult = await dialogService.confirm({
|
||||
type: 'info',
|
||||
message: localize('mergeEditor.acceptMerge.unhandledConflicts', "There are still unhandled conflicts. Are you sure you want to accept the merge?"),
|
||||
primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Complete merge with unhandled conflicts"),
|
||||
message: localize('mergeEditor.acceptMerge.unhandledConflicts.message', "Do you want to complete the merge of {0}?", basename(inputModel.resultUri)),
|
||||
detail: localize('mergeEditor.acceptMerge.unhandledConflicts.detail', "The file contains unhandled conflicts."),
|
||||
primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Complete with Conflicts"),
|
||||
secondaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.cancel', "Cancel"),
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue