reichaves commited on
Commit
3720984
1 Parent(s): 27b4fa7

Update main.yml

Browse files
Files changed (1) hide show
  1. .github/workflows/main.yml +15 -2
.github/workflows/main.yml CHANGED
@@ -18,11 +18,24 @@ jobs:
18
  run: |
19
  git config user.name github-actions
20
  git config user.email [email protected]
 
21
 
22
- - name: Pull from hub
23
  env:
24
  HF_TOKEN: ${{ secrets.HF_TOKEN }}
25
- run: git pull https://reichaves:[email protected]/spaces/reichaves/Chatbot-Gemma2-9b-It-all-MiniLM-L6-v2-Brazil-PDF main --allow-unrelated-histories
 
 
 
 
 
 
 
 
 
 
 
 
26
 
27
  - name: Push to hub
28
  env:
 
18
  run: |
19
  git config user.name github-actions
20
  git config user.email [email protected]
21
+ git config pull.rebase false
22
 
23
+ - name: Fetch from hub
24
  env:
25
  HF_TOKEN: ${{ secrets.HF_TOKEN }}
26
+ run: git fetch https://reichaves:[email protected]/spaces/reichaves/Chatbot-Gemma2-9b-It-all-MiniLM-L6-v2-Brazil-PDF main
27
+
28
+ - name: Merge changes
29
+ run: |
30
+ git merge FETCH_HEAD --allow-unrelated-histories -m "Merge Hugging Face changes"
31
+ continue-on-error: true
32
+
33
+ - name: Check for merge conflicts
34
+ run: |
35
+ if git ls-files -u | grep -q '^'; then
36
+ echo "Merge conflicts detected. Please resolve them manually."
37
+ exit 1
38
+ fi
39
 
40
  - name: Push to hub
41
  env: