Skip to content

Commit d1bb5aa

Browse files
committed
auto sync #3
1 parent 942710b commit d1bb5aa

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/sync.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ jobs:
6868
git fetch upstream ${{ inputs.upstream_sync_branch }}:temp_${{ inputs.upstream_sync_branch }}
6969
# 基于临时分支创建新的本地分支
7070
git checkout -b ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }}
71-
# 强制删除临时分支,没必要
72-
# git branch -D temp_${{ inputs.upstream_sync_branch }}
7371
# 推送新分支到远程仓库
7472
git push origin ${{ inputs.target_sync_branch }}
7573
else
@@ -80,10 +78,8 @@ jobs:
8078
git checkout temp_${{ inputs.upstream_sync_branch }}
8179
git branch -D ${{ inputs.target_sync_branch }} # 强制删除本地分支
8280
git branch ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }} # 创建新分支
83-
# 强制删除临时分支,没必要
84-
# git branch -D temp_${{ inputs.upstream_sync_branch }}
85-
# 推送新分支到远程仓库
86-
git push origin ${{ inputs.target_sync_branch }}
81+
# 强制推送新分支到远程仓库
82+
git push --force origin ${{ inputs.target_sync_branch }}
8783
fi
8884
8985
# # REQUIRED step

0 commit comments

Comments
 (0)