test1

.github/workflows/main.yml

@@ -41,6 +41,16 @@ jobs:
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }} 
           
-        run: |
-            git pull --rebase https://fahd9999:[email protected]/spaces/fahd9999/resultprediction main
-            git push https://fahd9999:[email protected]/spaces/fahd9999/resultprediction main
+         run: |
+            # Pull from the remote Hugging Face Space
+            git pull https://fahd9999:[email protected]/spaces/fahd9999/resultprediction main || true
+
+            # If there are conflicts, resolve them automatically
+            git checkout --ours . || true
+            git add . || true
+
+            # Commit resolved conflicts
+            git commit -m "Auto-resolve conflicts in workflow" || true
+
+            # Push the resolved code
+            git push https://fahd9999:[email protected]/spaces/fahd9999/resultprediction main || true