改进 rebase 错误处理:替换 || true 为日志输出

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-03-07 09:55:06 +00:00
parent 90883a87ab
commit 71a7789f06
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ jobs:
echo "📋 文档无变化,跳过提交"
else
git commit -m "📋 自动更新 HoloLake Era 模块文档 · $(date -u +%Y-%m-%d\ %H:%M\ UTC)"
git pull --rebase origin main || true
git pull --rebase origin main || echo "⚠️ rebase 失败(可能有冲突),尝试直接推送..."
git push || {
echo "⚠️ 推送失败,尝试重新拉取后再推送..."
git pull --rebase origin main

View File

@ -35,7 +35,7 @@ jobs:
git add .github/brain/repo-map.json .github/brain/repo-snapshot.md
git diff --cached --quiet || git commit -m "📚 铸渊图书馆目录更新 · $(date +%Y-%m-%dT%H:%M)"
# 拉取远端最新更改后再推送,避免竞态条件
git pull --rebase origin main || true
git pull --rebase origin main || echo "⚠️ rebase 失败(可能有冲突),尝试直接推送..."
git push || {
echo "⚠️ 推送失败,尝试重新拉取后再推送..."
git pull --rebase origin main