diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index b9510d765..de957af94 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -26,7 +26,8 @@ jobs: git config --global user.email "github_actions@quatalog.com" git checkout main - git checkout -b new-static-generated - git merge static-generated --allow-unrelated-histories + git checkout --orphan new-static-generated + git commit -m '${{ github.event.head_commit.message }}' + git merge static-generated --strategy-option ours --allow-unrelated-histories git push -u -f origin HEAD:static-generated