testing

opencrvs · Feb 26, 2025 · e1f7438 · e1f7438
1 parent 487cfcd
commit e1f7438
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
@@ -46,7 +46,7 @@ jobs:
           BASE_BRANCH=${{ github.event.pull_request.base.ref }}
           git checkout $BASE_BRANCH
           git pull origin $BASE_BRANCH
-          git merge bar/$BASE_BRANCH || echo "Merge conflict detected. Creating pull request."
+          git merge bar/$BASE_BRANCH --allow-unrelated-histories || echo "Merge conflict detected. Creating pull request."
 
       - name: Pull latest changes from bar before pushing
         if: env.branch_exists == 'true' && !failure()