Update release.yml

Author: egil

.github/workflows/release.yml

@@ -109,18 +109,19 @@ jobs:
         continue-on-error: true
         run: |
           git checkout main
+          echo "MERGE_CONFLICT_STATUS=CONFLICT" >> $GITHUB_ENV
           git merge --no-commit --no-ff stable
-          echo "CAN_MERGE=true" >> $GITHUB_ENV
+          echo "MERGE_CONFLICT_STATUS=OK" >> $GITHUB_ENV
       
       - name: ⏩ Merge stable with main, push main        
-        if: env.CAN_MERGE == "true"
+        if: env.MERGE_CONFLICT_STATUS == 'OK'
         run: | 
           git merge --abort
           git merge -S stable
           git push origin main
           
       - name: ⏭ Create pull request from stable to main
-        if: env.CAN_MERGE != "true"
+        if: env.MERGE_CONFLICT_STATUS == 'CONFLICT'
         uses: thomaseizinger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}