Skip to content

Commit 3d13982

Browse files
authored
CI: specify merge strategy option for blog drafts branch (#355)
1 parent 68bbb76 commit 3d13982

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/blog-drafts-rebase.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
git config --global user.name "${USER_NAME}"
2121
2222
git checkout "emmercm/blog-drafts"
23-
git merge --no-edit origin/master
23+
git merge --no-edit --strategy-option=theirs origin/master
2424
git push
2525
env:
2626
GH_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)