diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 7cb95b6..2680f4b 100644 --- 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