From 7936093c33dcd68aebdfa309fca2869bacc31abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 3 Nov 2020 14:33:09 +0100
Subject: [PATCH] git: merge resources should return undefined original
 resource

related to #109022
---
 extensions/git/src/repository.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 6b4fd018815..5e0c4e4fafe 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -864,6 +864,12 @@ export class Repository implements Disposable {
 			return;
 		}
 
+		const path = uri.path;
+
+		if (this.mergeGroup.resourceStates.some(r => r.resourceUri.path === path)) {
+			return undefined;
+		}
+
 		return toGitUri(uri, '', { replaceFileExtension: true });
 	}