Update build-figma-tokens.yml

undp · Nov 5, 2024 · c6a2baa · c6a2baa
1 parent 2ab8298
commit c6a2baa
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/build-figma-tokens.yml b/.github/workflows/build-figma-tokens.yml
@@ -44,15 +44,7 @@ jobs:
       - name: Push changes
         run: |
           git push origin ${{ github.ref_name }} || echo "No changes to push"
-
-      # Attempt to automatically resolve conflicts by removing the file if needed
-      - name: Resolve conflicts
-        run: |
           git status
-          if git ls-files -u | grep -q "figma-tokens/transformed-tokens/tokens-transformed.json"; then
-            git rm figma-tokens/transformed-tokens/tokens-transformed.json
-            git commit -m "Resolved conflict by removing tokens-transformed.json"
-          fi
 
       # Automatic pull request
       - name: Create Pull Request