diff --git a/.github/workflows/compile-clients.yml b/.github/workflows/compile-clients.yml index d40cd0b..6ba2a71 100644 --- a/.github/workflows/compile-clients.yml +++ b/.github/workflows/compile-clients.yml @@ -52,5 +52,5 @@ jobs: if: steps.git-auto-commit-action.outputs.changes_detected == 'true' run: | git checkout dev - git merge --rebase ${{ steps.git-auto-commit-action.outputs.commit_hash }} + git merge --rebase --allow-unrelated-histories main git push origin dev