testing old action for document generation

Crypto-TII · Jun 6, 2024 · 3157b35 · 3157b35
1 parent 3db4946
commit 3157b35
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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 }}