gh-119 added flag to allow merging

gchq · Nov 16, 2020 · f750a11 · f750a11
1 parent f2b08e5
commit f750a11
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -56,7 +56,7 @@ jobs:
       run: |
         git remote set-branches --add origin develop
         git pull
-        git merge origin/develop
+        git merge origin/develop --allow-unrelated-histories 
 
     - name: Push changes
       run: git push