fix(cicd): update merge.yml

check merge conflict in relation to the develop branch!
Swarmies · Sep 8, 2023 · 20b7016 · 20b7016
1 parent c4ab7f2
commit 20b7016
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -16,7 +16,7 @@ jobs:
 
       - name: Check for merge conflicts
         run: |
-          git merge-base origin/main HEAD
+          git merge-base origin/develop HEAD
           if [[ $? -ne 0 ]]; then
             echo "Merge conflict detected. Please resolve conflicts before merging."
             exit 1