From 8337030f0ae68862eca0d313fe76ff7f445d532b Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 23 Jan 2025 13:14:03 +0100
Subject: [PATCH] Git - select the correct object for a merge conflict ref

---
 extensions/git/src/git.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 5e1eb1925dc78..431d50b88afee 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1374,7 +1374,10 @@ export class Repository {
 				throw new GitError({ message: 'Path not known by git', gitErrorCode: GitErrorCodes.UnknownPath });
 			}
 
-			const { mode, object } = elements[0];
+			const { mode, object } = treeish !== ''
+				? elements.find(e => e.stage === treeish.substring(1)) ?? elements[0]
+				: elements[0];
+
 			const catFile = await this.exec(['cat-file', '-s', object]);
 			const size = parseInt(catFile.stdout);