diff --git a/configs/git-auto-sync.conf b/configs/git-auto-sync.conf index f459c1b..a5c5e5c 100644 --- a/configs/git-auto-sync.conf +++ b/configs/git-auto-sync.conf @@ -5,7 +5,7 @@ REMOTES="origin=https://git.shiroko.one/tamakyi/github-auto-sync-golang" MODE="push" INTERVAL="60" LOG_FILE="" -AUTH_METHOD="ssh" +AUTH_METHOD="https" RETRY_COUNT="0" RETRY_INTERVAL="0" CONFLICT_STRATEGY="merge" diff --git a/logs/git-auto-sync.log b/logs/git-auto-sync.log index f9ca281..f578310 100644 --- a/logs/git-auto-sync.log +++ b/logs/git-auto-sync.log @@ -231,3 +231,19 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details. [2026-09-08 18:47:38] 推送失败,本轮同步已终止(跳过拉取以避免分叉加剧) [2026-09-08 18:47:45] === 开始同步(手动触发,模式 push)=== [2026-09-08 18:47:49] 检测到 2 个未提交改动,执行自动提交 +[2026-09-08 18:47:49] 自动提交完成,将随本轮同步推送 +[2026-09-08 18:47:55] 推送至 origin 失败: To https://git.shiroko.one/tamakyi/github-auto-sync-golang + ! [rejected] main -> main (non-fast-forward) +error: failed to push some refs to 'https://git.shiroko.one/tamakyi/github-auto-sync-golang' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +[2026-09-08 18:47:55] 推送失败,本轮同步已终止(跳过拉取以避免分叉加剧) +[2026-09-08 18:48:20] === 开始同步(定时检查,模式 push)=== +[2026-09-08 18:48:26] 配置已更新 +[2026-09-08 18:48:26] 监控已停止 +[2026-09-08 18:48:26] 监控已启动 +[2026-09-08 18:48:26] === 开始同步(启动检查,模式 push)=== +[2026-09-08 18:48:30] 检测到 3 个未提交改动,执行自动提交 +[2026-09-08 18:48:31] 检测到 3 个未提交改动,执行自动提交 diff --git a/stats/git-auto-sync.csv b/stats/git-auto-sync.csv index 7aea754..cc1e8ce 100644 --- a/stats/git-auto-sync.csv +++ b/stats/git-auto-sync.csv @@ -27,3 +27,4 @@ timestamp,action,result,commits 2026-09-08 18:45:45,push,failed,27 2026-09-08 18:47:20,push,failed,28 2026-09-08 18:47:38,push,failed,29 +2026-09-08 18:47:55,push,failed,30