Update main.yml

.github/workflows/main.yml

@@ -10,18 +10,16 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # Ensures full history is fetched
+          fetch-depth: 0
           lfs: true
 
-      - name: Pull latest changes
-        run: git pull origin main  # Pull latest changes from remote before pushing
+      - name: Pull changes from Hugging Face
+        run: git pull https://huggingface.co/spaces/j565xu/test main
 
-      - name: Check status after pull
-        run: git status
+      - name: Resolve conflicts automatically (if safe)
+        run: git merge --strategy-option theirs || true  # Keeps Hugging Face changes if possible
 
-
-      - name: Force push to hub
+      - name: Push merged changes to Hugging Face
         env:
           HF_TOKEN: ${{ secrets.token }}
-        run: git push --force https://j565xu:$HF_TOKEN@huggingface.co/spaces/j565xu/test main
-
+        run: git push https://j565xu:$HF_TOKEN@huggingface.co/spaces/j565xu/test main