Change rebase to merge

akucharska · Jan 30, 2025 · 6e158af · 6e158af
1 parent 3269347
commit 6e158af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/actions/rebase/action.yml b/.github/actions/rebase/action.yml
@@ -25,9 +25,9 @@ runs:
         git switch --detach ${{ github.sha }}
       shell: bash
 
-    - name: Rebase to main
+    - name: Merge to main
       run: |
-        git rebase main
+        git merge main
       shell: bash
 
     - name: Print branch log