Fixes issue when Git has a 'Modify/Delete' conflict after a merge

996ced60 · Marc Kassay · 2a96848e · 996ced60
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

extensions/git/src/commands.ts extensions/git/src/commands.ts +4 -0

未找到文件。
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -160,6 +160,9 @@ export class CommandCenter {

 			case Status.MODIFIED:
 				return toGitUri(resource.resourceUri, '~');
+
+			case Status.DELETED_BY_THEM:
+				return toGitUri(resource.resourceUri, '');
 		}
 	}

@@ -172,6 +175,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');