Let's fix bonked workflow files (#2059)

* Update update_tgs_dmapi.yml

* Update update_tgs_dmapi.yml

.github/workflows/update_tgs_dmapi.yml

@@ -10,9 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     name: Update the TGS DMAPI
     steps:
-<<<<<<< HEAD
-    - uses: tgstation/tgs-dmapi-updater@v1.0.5
-=======
     - name: Clone
       uses: actions/checkout@v2
 
@@ -24,12 +21,12 @@ jobs:
 
     - name: Apply DMAPI update
       uses: tgstation/tgs-dmapi-updater@v2
->>>>>>> 83ee251ddec... Fix DMAPI auto updater (#54410)
       with:
         header-path: 'code/__DEFINES/tgs.dm'
         library-path: 'code/modules/tgs'
 
     - name: Commit and Push
+      continue-on-error: true
       run: |
         git config user.name tgstation-server
         git config user.email tgstation-server@users.noreply.github.com
@@ -39,6 +36,7 @@ jobs:
 
     - name: Create Pull Request
       uses: repo-sync/pull-request@v2
+      if: ${{ success() }}
       with:
         source_branch: "tgs-dmapi-update"
         destination_branch: "master"