From 7e6feed82c5e3980a689a95a25c778aa1358f26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mati=CC=81as?= <mjlescano@protonmail.com>
Date: Fri, 3 Jan 2025 09:48:29 -0300
Subject: [PATCH] fix(ci): fix fetching of main on backmerge action

---
 .github/workflows/backmerge.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/backmerge.yml b/.github/workflows/backmerge.yml
index 5242a2b73..1b6e22f71 100644
--- a/.github/workflows/backmerge.yml
+++ b/.github/workflows/backmerge.yml
@@ -16,9 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 1 # Only fetch last commit
-          ref: dev # Checkout dev branch
-          fetch-tags: false # Don't fetch tags
+          fetch-depth: 0
+          ref: dev
+          fetch-tags: false
 
       - name: Configure Git
         run: |
@@ -28,7 +28,9 @@ jobs:
       - name: Merge main into dev
         id: merge
         continue-on-error: true
-        run: git merge origin/main --no-edit
+        run: |
+          git fetch origin main
+          git merge origin/main --no-edit
 
       - name: Push if merge successful
         if: steps.merge.outcome == 'success'