Skip to content

Commit c8efdb1

Browse files
authored
Update sync-upstream.yaml
1 parent 783ddb1 commit c8efdb1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/sync-upstream.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
git remote add upstream https://github.com/ton-blockchain/wallets-list.git
2828
git fetch upstream
2929
30-
- name: Rebase onto upstream
30+
- name: Merge upstream
3131
run: |
3232
git checkout main
33-
git rebase upstream/main
33+
git merge --no-edit upstream/main
3434
3535
- name: Push changes
3636
run: |

0 commit comments

Comments
 (0)