test: dummy conflict

makafsal · Jan 7, 2025 · c3d0483 · c3d0483
1 parent cd912ce
commit c3d0483
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/create-release-tag-and-pr.yml b/.github/workflows/create-release-tag-and-pr.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Attempt merge
         id: merge-attempt
         run: |
-          git merge origin/test-release-action
+          git merge origin/test-release-action -Xours
 
       # Create PR with the new branch
       - name: Create Pull Request