force push

Apollo-XIV · Aug 30, 2024 · 472488c · 472488c
1 parent 291b5e2
commit 472488c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/distribute.yaml b/.github/workflows/distribute.yaml
@@ -29,13 +29,13 @@ jobs:
       #     git fetch ${{matrix.module}}
       #     git subtree add --prefix=${{matrix.module}} ${{matrix.module}} main --squash || echo "Subtree already exists, skipping add."
 
-      - name: Pull latest changes from the target repo
-        run: |
-          git subtree pull --prefix=${{matrix.module}} https://$GITHUB_ACTOR:${{secrets.PERSONAL_ACCESS_TOKEN}}@github.com/Apollo-XIV/${{matrix.module}}.git main
+      # - name: Pull latest changes from the target repo
+      #   run: |
+      #     git subtree pull --prefix=${{matrix.module}} https://$GITHUB_ACTOR:${{secrets.PERSONAL_ACCESS_TOKEN}}@github.com/Apollo-XIV/${{matrix.module}}.git main
 
       - name: Push changes back to target repo
         run: |
-          git subtree push --prefix=${{matrix.module}} https://$GITHUB_ACTOR:${{secrets.PERSONAL_ACCESS_TOKEN}}@github.com/Apollo-XIV/${{matrix.module}}.git main
+          git subtree push --force --prefix=${{matrix.module}} https://$GITHUB_ACTOR:${{secrets.PERSONAL_ACCESS_TOKEN}}@github.com/Apollo-XIV/${{matrix.module}}.git main
 
       - name: Clean up remotes
         run: git remote remove ${{matrix.module}}