Fix cask push: reset to origin/main before updating to avoid rebase conflicts

Author: naga-nandyala

.azure-pipelines/templates/macos/macos-publish-jobs.yml

@@ -182,6 +182,10 @@ jobs:
         
         cd $(Pipeline.Workspace)/homebrew-tap
         
+        # Always start from the latest origin/main to avoid rebase conflicts
+        git fetch origin main
+        git reset --hard origin/main
+        
         # Homebrew uses sharded cask layout: Casks/<first-letter>/<name>.rb
         CASK_DIR="Casks/a"
         mkdir -p "$CASK_DIR"
@@ -200,7 +204,6 @@ jobs:
         git config user.email "azure-pipeline@microsoft.com"
         git add "$CASK_DIR/azure-cli.rb"
         git commit -m "Update azure-cli to $VERSION" || echo "No changes"
-        git pull --rebase origin main
         git push origin HEAD:main
         
         echo "Homebrew cask updated successfully"