From 3157b355e6ef635a476f6258f65b80619e816794 Mon Sep 17 00:00:00 2001
From: sharath <sharathchandravutpala@gmail.com>
Date: Thu, 6 Jun 2024 10:40:06 +0400
Subject: [PATCH] testing old action for document generation

---
 .github/workflows/generate-and-submit-documentation.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/generate-and-submit-documentation.yaml b/.github/workflows/generate-and-submit-documentation.yaml
index abd87de1..44701678 100644
--- a/.github/workflows/generate-and-submit-documentation.yaml
+++ b/.github/workflows/generate-and-submit-documentation.yaml
@@ -38,8 +38,9 @@ jobs:
         message: "Update documentation"
 
     - name: Update develop branch
-      uses: devmasx/merge-branch@master
+      uses:  morbalint/git-merge-action@v1
       with:
-        target_branch: 'fix/generate-documentation-workflow-test-merge'
-        type: now
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        target: 'fix/generate-documentation-workflow-test-merge'
+        source: 'test/runner_scale_sets_for_ci'
+        strategy_options: 'ours'
+        token: ${{ secrets.GITHUB_TOKEN }}