diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 90786c4..1908dc0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: git fetch git pull git checkout master - git merge --no-ff release/patch + git merge --allow-unrelated-histories --no-ff release/patch git push origin master build: strategy: