Update auto-cl-update-atd.yml

AdventureTimeSS14 · Jun 27, 2024 · 235efa1 · 235efa1
1 parent 2576712
commit 235efa1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/auto-cl-update-atd.yml b/.github/workflows/auto-cl-update-atd.yml
@@ -48,7 +48,7 @@ jobs:
       run: |
         git fetch origin
         git checkout -B update-changelog origin/update-changelog || git checkout -b update-changelog
-        git merge origin/update-changelog || echo "No changes to merge"
+        git merge -X ours origin/update-changelog || echo "No changes to merge"
 
     - name: Push changes to a new branch
       if: steps.commit-changes.outcome == 'success'