Skip to content

Commit 6e158af

Browse files
committed
Change rebase to merge
1 parent 3269347 commit 6e158af

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/actions/rebase/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ runs:
2525
git switch --detach ${{ github.sha }}
2626
shell: bash
2727

28-
- name: Rebase to main
28+
- name: Merge to main
2929
run: |
30-
git rebase main
30+
git merge main
3131
shell: bash
3232

3333
- name: Print branch log

0 commit comments

Comments
 (0)