chore: Nivelamento da main para develop

.github/workflows/develop.yml

@@ -28,7 +28,7 @@ jobs:
     if: needs.test-and-lint.outputs.code-changed == 'true'
     uses: ./.github/workflows/reusable-deploy-vercel.yml
     with:
-      environment: Development
+      environment: Develop
       vercel-environment: preview
       ref: ${{ github.ref }}
       prebuilt: true

.github/workflows/preview.yml

@@ -57,11 +57,11 @@ jobs:
         run: |
           SOURCE_BRANCH="${{ github.head_ref }}"
           echo "Source branch: $SOURCE_BRANCH"
-          if [[ "$SOURCE_BRANCH" != release/* ]]; then
-            echo "::error::Pull Request from branch '$SOURCE_BRANCH' cannot be merged into 'main'. Only branches starting with 'release/' are allowed."
+          if [[ "$SOURCE_BRANCH" != release/* && "$SOURCE_BRANCH" != hotfix/* ]]; then
+            echo "::error::Pull Request from branch '$SOURCE_BRANCH' cannot be merged into 'main'. Only branches starting with 'release/' or 'hotfix/' are allowed."
             exit 1
           else
-            echo "Source branch '$SOURCE_BRANCH' is a valid release branch."
+            echo "Source branch '$SOURCE_BRANCH' is a valid release or hotfix branch."
           fi
 
   update-pr-comment:

.github/workflows/sync-main-to-develop.yml

@@ -43,16 +43,21 @@ jobs:
           echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
           git checkout -B $BRANCH_NAME origin/develop
 
+          # Tenta fazer o merge da 'main' na branch de sincronização.
+          # A estrutura 'if/else' trata o código de saída, então o passo não falhará em caso de conflitos.
           if git merge origin/main --allow-unrelated-histories --no-edit -m "chore: sync main back to develop"; then
-            echo "Merge successful without conflicts."
+            # Se o merge for bem-sucedido e não houver conflitos.
+            echo "Merge da main para a branch de sync foi bem-sucedido, sem conflitos."
           else
-            echo "::warning::Merge failed due to conflicts. Committing files with conflict markers."
+            # Se o merge falhar (geralmente por conflitos).
+            echo "::warning::O merge falhou, provavelmente devido a conflitos. Arquivos com marcadores de conflito serão commitados para resolução manual."
+            # Após uma falha de merge, os arquivos com conflitos estão no diretório de trabalho.
+            # Adicionamos e commitamos esses arquivos para que possam ser resolvidos no Pull Request.
             git add .
-            git commit -m "chore: sync main with conflicts for manual resolution"
-          else
-            echo "Merge completed successfully."
+            git commit -m "chore: Sincroniza main com conflitos para resolução manual"
           fi
 
+          # Faz o push do resultado para o repositório, seja um merge limpo ou com conflitos.
           git push --force https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git HEAD:$BRANCH_NAME
 
       - name: Create or Update Pull Request

CHANGELOG.md

@@ -1,3 +1,33 @@
+## [1.4.4](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.3...v1.4.4) (2025-11-29)
+
+
+### Bug Fixes
+
+* **sync-workflow:** Corrige lógica de merge com else duplicado ([6ed025c](https://github.com/JaegerCaiser/mrdeveloper/commit/6ed025c268299f2e82098eb064cf159867713fb1))
+
+## [1.4.3-beta.1](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.2...v1.4.3-beta.1) (2025-11-29)
+
+
+### Bug Fixes
+
+* Corrige permissões e autenticação no workflow de sync ([f86d53b](https://github.com/JaegerCaiser/mrdeveloper/commit/f86d53b0e765627fd4b8612cdbde36e5bafcfe5f))
+* **sync-workflow:** Corrige lógica de merge com else duplicado ([6ed025c](https://github.com/JaegerCaiser/mrdeveloper/commit/6ed025c268299f2e82098eb064cf159867713fb1))
+
+## [1.4.2](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.1...v1.4.2) (2025-11-29)
+
+
+### Bug Fixes
+
+* the sync need to continue even the conflict ([05048ec](https://github.com/JaegerCaiser/mrdeveloper/commit/05048ec3394f7f5824cacf19ae7308ab4a7ca2f1))
+
+## [1.4.1](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.4.0...v1.4.1) (2025-11-27)
+
+
+### Bug Fixes
+
+* **ci:** allow hotfix branches in preview validation ([a745e79](https://github.com/JaegerCaiser/mrdeveloper/commit/a745e79a099e69e90ca8a688b3f6952fb1d0777f))
+* disable pointer events on flying santa canvas ([cd708d0](https://github.com/JaegerCaiser/mrdeveloper/commit/cd708d0570c1f9b1fbe10bd13b9e4b035716a0ce))
+
 # [1.4.0](https://github.com/JaegerCaiser/mrdeveloper/compare/v1.3.1...v1.4.0) (2025-11-27)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrdeveloper",
-  "version": "1.4.0",
+  "version": "1.4.4",
   "type": "module",
   "packageManager": "pnpm@10.20.0",
   "homepage": "https://www.mrdeveloper.com.br/",

src/components/FlyingSanta.tsx

@@ -262,7 +262,10 @@ const FlyingSanta = () => {
         zIndex: 9999,
       }}
     >
-      <Canvas camera={{ position: [0, 0, 8], fov: 45 }}>
+      <Canvas
+        camera={{ position: [0, 0, 8], fov: 45 }}
+        style={{ pointerEvents: "none" }}
+      >
         <ambientLight intensity={1.5} />
         <directionalLight position={[10, 10, 10]} intensity={2} />
         <pointLight position={[-10, -10, -10]} intensity={0.5} />