test: dummy conflict

makafsal · Jan 7, 2025 · 9b7bc4b · 9b7bc4b
1 parent 81d2d47
commit 9b7bc4b
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/.github/workflows/create-release-tag-and-pr.yml b/.github/workflows/create-release-tag-and-pr.yml
@@ -49,6 +49,17 @@ jobs:
         run: |
           git checkout test-release-action-2
           git push origin test-release-action-2
+
+      - name: Check for conflicts and resolve
+        run: |
+          git merge origin/main
+          if [ $? -ne 0 ]; then
+            echo "Merge conflicts detected"
+            # Resolve conflicts by choosing current version as latest than main
+            git checkout --ours .
+            git add .
+            git commit -m "chore: resolved merge conflicts"
+            
       # Create PR with the new branch
       - name: Create Pull Request
         run: |