From dd287fdd1839376a2736e314db257dab34c0d373 Mon Sep 17 00:00:00 2001
From: Volodymyr Skliar <v.skliar@scalr.com>
Date: Thu, 18 Jan 2024 21:50:54 +0800
Subject: [PATCH] SCALRCORE-29806 fixed test

---
 .github/actions/update-app-version/index.dist.js | 1 +
 .github/actions/update-app-version/index.js      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/actions/update-app-version/index.dist.js b/.github/actions/update-app-version/index.dist.js
index f6f3413..52787a8 100644
--- a/.github/actions/update-app-version/index.dist.js
+++ b/.github/actions/update-app-version/index.dist.js
@@ -18526,6 +18526,7 @@ async function mergePR (prNumber) {
       owner: github.context.repo.owner,
       repo: github.context.repo.repo,
       pull_number: prNumber,
+      merge_method: 'rebase'
     })
     core.notice(
       `Merged PR #${prNumber}`
diff --git a/.github/actions/update-app-version/index.js b/.github/actions/update-app-version/index.js
index 9875a0f..4056ba9 100644
--- a/.github/actions/update-app-version/index.js
+++ b/.github/actions/update-app-version/index.js
@@ -87,6 +87,7 @@ async function mergePR (prNumber) {
       owner: github.context.repo.owner,
       repo: github.context.repo.repo,
       pull_number: prNumber,
+      merge_method: 'rebase'
     })
     core.notice(
       `Merged PR #${prNumber}`