Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-01 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27882 from marckassay/24919

Browse Source 
For 'conflict (add/add)' and 'conflict (modify/delete)' issues
This commit is contained in:
João Moreno
2017-08-10 15:04:53 +01:00
committed by GitHub
parent 0e0bc4d200 b7b818e8f2
commit 688df5e5cc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/git/src/commands.ts
View File

@@ -196,6 +196,9 @@ export class CommandCenter {
case Status.MODIFIED:
return toGitUri(resource.resourceUri, '~');
case Status.DELETED_BY_THEM:
return toGitUri(resource.resourceUri, '');
}
}
@@ -208,6 +211,7 @@ export class CommandCenter {
return toGitUri(resource.resourceUri, '');
case Status.INDEX_DELETED:
case Status.DELETED_BY_THEM:
case Status.DELETED:
return toGitUri(resource.resourceUri, 'HEAD');
@@ -223,6 +227,7 @@ export class CommandCenter {
return resource.resourceUri;
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return resource.resourceUri;
}
@@ -234,9 +239,12 @@ export class CommandCenter {
switch (resource.type) {
case Status.INDEX_MODIFIED:
case Status.INDEX_RENAMED:
case Status.DELETED_BY_THEM:
return `${basename} (Index)`;
case Status.MODIFIED:
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return `${basename} (Working Tree)`;
}