From 71a7789f0691f3e2be6b5eaf90de7c43743f4060 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Mar 2026 09:55:06 +0000 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20rebase=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86=EF=BC=9A=E6=9B=BF=E6=8D=A2=20||=20t?= =?UTF-8?q?rue=20=E4=B8=BA=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com> --- .github/workflows/generate-module-doc.yml | 2 +- .github/workflows/update-repo-map.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-module-doc.yml b/.github/workflows/generate-module-doc.yml index 15017793..9c837b39 100644 --- a/.github/workflows/generate-module-doc.yml +++ b/.github/workflows/generate-module-doc.yml @@ -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 diff --git a/.github/workflows/update-repo-map.yml b/.github/workflows/update-repo-map.yml index fb1cb32b..b2104c70 100644 --- a/.github/workflows/update-repo-map.yml +++ b/.github/workflows/update-repo-map.yml @@ -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