Resolved merge conflict with main

Author: manucodin

.github/workflows/release.yml

@@ -11,7 +11,6 @@ jobs:
     runs-on: macos-14
     permissions:
       contents: write
-      pull-requests: write
 
     steps:
       - name: Checkout repository
@@ -135,7 +134,6 @@ jobs:
           sed -i '' "s/VERSION_PLACEHOLDER/${TAG}/g" "$FORMULA_FILE"
           sed -i '' "s/SHA256_PLACEHOLDER/${SHA256}/g" "$FORMULA_FILE"
       
-<<<<<<< HEAD
       - name: Create branch and push changes
         run: |
           TAG=${{ steps.get_version.outputs.tag }}
@@ -146,24 +144,10 @@ jobs:
           git pull
           
           # Check if there are changes
-=======
-      - name: Checkout main branch
-        run: |
-          git checkout main || git checkout master
-          git pull
-      
-      - name: Check for changes
-        id: check_changes
-        run: |
->>>>>>> origin/main
           if git diff --quiet homebrew-tap/swift-mock-generator.rb; then
-            echo "has_changes=false" >> $GITHUB_OUTPUT
             echo "No changes to commit"
-          else
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-            git add homebrew-tap/swift-mock-generator.rb
+            exit 0
           fi
-<<<<<<< HEAD
           
           # Create branch, commit and push
           git checkout -b "$BRANCH_NAME"
@@ -177,26 +161,3 @@ jobs:
           
           echo "✅ Branch '$BRANCH_NAME' created and pushed successfully"
           echo "You can now create a PR from this branch to main"
-=======
-      
-      - name: Create Pull Request
-        if: steps.check_changes.outputs.has_changes == 'true'
-        uses: peter-evans/create-pull-request@v5
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update Homebrew formula to ${{ steps.get_version.outputs.tag }}"
-          title: "Update Homebrew formula to ${{ steps.get_version.outputs.tag }}"
-          body: |
-            This PR automatically updates the Homebrew formula for release ${{ steps.get_version.outputs.tag }}.
-            
-            - **Version**: ${{ steps.get_version.outputs.tag }}
-            - **SHA256**: ${{ steps.sha256.outputs.sha256 }}
-            
-            This PR was created automatically by the release workflow.
-          branch: update-homebrew-formula-${{ steps.get_version.outputs.tag }}
-          delete-branch: true
-          labels: |
-            automated
-            homebrew
-          draft: false
->>>>>>> origin/main