From afb21a3ca3b2350a6a736c97c0c300fd85f9260e Mon Sep 17 00:00:00 2001
From: Calvin Lee <calvin.lee@harness.io>
Date: Fri, 3 Nov 2023 17:40:11 +0000
Subject: [PATCH] fix: [code-970]: add commitsha to merge api (#766)

---
 .../PullRequestActionsBox/PullRequestActionsBox.tsx          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
index 8a14f0423..7d88dd869 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -314,7 +314,10 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
                             {...permissionProps(permPushResult, standalone)}
                             onClick={async () => {
                               if (mergeOption.method !== 'close') {
-                                const payload: OpenapiMergePullReq = { method: mergeOption.method }
+                                const payload: OpenapiMergePullReq = {
+                                  method: mergeOption.method,
+                                  source_sha: pullRequestMetadata?.source_sha
+                                }
                                 mergePR(payload)
                                   .then(onPRStateChanged)
                                   .catch(exception => showError(getErrorMessage(exception)))