diff --git a/scripts/run_daily_digest.sh b/scripts/run_daily_digest.sh index cddb0e4..2022e1f 100755 --- a/scripts/run_daily_digest.sh +++ b/scripts/run_daily_digest.sh @@ -17,11 +17,14 @@ python3 analyzers/daily_digest.py >> "$LOG_FILE" 2>&1 # Git push to Gitea cd "$PROJECT_DIR" +# 先拉取远程,避免分支分歧 +git pull --rebase origin main >> "$LOG_FILE" 2>&1 || true + # Check if there are changes if [[ -n $(git status --porcelain ai-insights/) ]]; then git add ai-insights/ git commit -m "daily digest $(date '+%Y-%m-%d')" - git push origin main 2>&1 | tail -3 >> "$LOG_FILE" + git push origin main 2>&1 >> "$LOG_FILE" echo "Pushed to Gitea" >> "$LOG_FILE" else echo "No changes to push" >> "$LOG_FILE"