Update auto-cl-update-atd.yml

AdventureTimeSS14 · Jun 27, 2024 · 531771e · 531771e
1 parent fe2193d
commit 531771e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/auto-cl-update-atd.yml b/.github/workflows/auto-cl-update-atd.yml
@@ -49,11 +49,6 @@ jobs:
         git diff-index --quiet HEAD || git commit -m "Auto cl update"
       continue-on-error: true
 
-    - name: Merge changes with ours strategy
-      if: steps.commit-changes.outcome == 'success'
-      run: |
-        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'
       env: