development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #162043 by renaming "Accept Merge" to "Complete Merge" (#162361)

Browse source
This commit is contained in:
Henning Dieterichs 2022-09-29 17:19:06 +02:00 committed by GitHub
parent 5c168e7c39
commit 46afa5b108
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/git/package.nls.json
View file

@ -103,7 +103,7 @@
"command.api.getRepositories": "Get Repositories",
"command.api.getRepositoryState": "Get Repository State",
"command.api.getRemoteSources": "Get Remote Sources",
"command.git.acceptMerge": "Accept Merge",
"command.git.acceptMerge": "Complete Merge",
"command.git.openMergeEditor": "Resolve in Merge Editor",
"command.git.runGitMerge": "Compute Conflicts With Git",
"command.git.runGitMergeDiff3": "Compute Conflicts With Git (Diff3)",

4
extensions/git/src/commands.ts
View file

@ -1162,7 +1162,7 @@ export class CommandCenter {
const repository = this.model.getRepository(uri);
if (!repository) {
console.log(`FAILED to accept merge because uri ${uri.toString()} doesn't belong to any repository`);
console.log(`FAILED to complete merge because uri ${uri.toString()} doesn't belong to any repository`);
return;
}
@ -1183,7 +1183,7 @@ export class CommandCenter {
// make sure to save the merged document
const doc = workspace.textDocuments.find(doc => doc.uri.toString() === uri.toString());
if (!doc) {
console.log(`FAILED to accept merge because uri ${uri.toString()} doesn't match a document`);
console.log(`FAILED to complete merge because uri ${uri.toString()} doesn't match a document`);
return;
}
if (doc.isDirty) {

6
src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
View file

@ -616,9 +616,9 @@ export class AcceptMerge extends MergeEditorAction2 {
title: {
value: localize(
'mergeEditor.acceptMerge',
'Accept Merge'
'Complete Merge'
),
original: 'Accept Merge',
original: 'Complete Merge',
},
f1: false,
precondition: ctxIsMergeEditor
@ -633,7 +633,7 @@ export class AcceptMerge extends MergeEditorAction2 {
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', "Accept merge with unhandled conflicts"),
primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Complete merge with unhandled conflicts"),
secondaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.cancel', "Cancel"),
});

2
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
View file

@ -1152,7 +1152,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
constructor() {
super({
id: 'workbench.userDataSync.actions.acceptMerges',
title: localize('accept merges title', "Accept Merge"),
title: localize('complete merges title', "Complete Merge"),
menu: [{
id: MenuId.EditorContent,
when: ContextKeyExpr.and(ctxIsMergeResultEditor, ContextKeyExpr.regex(ctxMergeBaseUri.key, new RegExp(`^${USER_DATA_SYNC_SCHEME}:`))),