diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db8c265..6f82d7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: run: | git checkout master git pull - git merge origin/develop + git merge origin/develop --strategy-option theirs git push - name: Draft release