Update update_master.yml

cloudinary · Apr 14, 2024 · 4a24037 · 4a24037
1 parent 4480d18
commit 4a24037
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/update_master.yml b/.github/workflows/update_master.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           git config user.name "cloudinary-jenkins"
           git config user.email "[email protected]"
-          git merge -X ours --no-edit origin/edge
+          git merge -X ours --no-edit origin/edge || true
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6