Skip to content

Commit 3b6415c

Browse files
committed
ci: change merge command
1 parent 2c5519d commit 3b6415c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
git fetch origin
7070
git switch main
7171
git pull origin main
72-
git merge origin/release --no-ff -m "chore: merge release into main" --no-verify
72+
git merge origin/release --ff-only -m "chore: merge release into main" --no-verify
7373
git push origin main
7474
7575
- name: Build code 🛠

0 commit comments

Comments
 (0)