From fe50f0085e785113f938a5cf53189188aacbf37d Mon Sep 17 00:00:00 2001
From: Tsachi Shlidor <tsachi.shlidor@cloudinary.com>
Date: Sun, 14 Jul 2024 16:05:49 +0300
Subject: [PATCH] Update update_master.yml

---
 .github/workflows/update_master.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/update_master.yml b/.github/workflows/update_master.yml
index 0cdab2ca..b1f62c39 100644
--- a/.github/workflows/update_master.yml
+++ b/.github/workflows/update_master.yml
@@ -19,6 +19,20 @@ jobs:
           git checkout -b update-master
           git merge -X ours --no-edit origin/edge || true
 
+      - name: Auto-resolve conflicts
+        run: |
+          if git status | grep -q 'You have unmerged paths'; then
+            git status | grep 'both modified:' | awk '{print $3}' | xargs git checkout --ours
+            git add .
+            git commit -m "Auto-resolve conflicts"
+          fi
+          
+      - name: Push changes
+        run: |
+          git push origin update-master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6
         with: