diff --git a/.github/workflows/firebase_distribution_builder.yml b/.github/workflows/firebase_distribution_builder.yml index 79b3a4e..1595440 100644 --- a/.github/workflows/firebase_distribution_builder.yml +++ b/.github/workflows/firebase_distribution_builder.yml @@ -91,5 +91,5 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git fetch origin git checkout develop - git merge production --no-ff --no-edit + git merge production --no-ff --no-edit --allow-unrelated-histories git push origin develop \ No newline at end of file