Skip to content

Commit 65df86e

Browse files
committed
auto sync #3
1 parent 3b9d9f5 commit 65df86e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/sync.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ jobs:
7777
echo "Remote branch ${{ inputs.target_sync_branch }} exists."
7878
# 创建一个临时分支来fetch远程分支的内容
7979
git fetch upstream ${{ inputs.upstream_sync_branch }}:temp_${{ inputs.upstream_sync_branch }}
80-
git branch origin -D ${{ inputs.target_sync_branch }} # 强制删除本地分支
81-
git branch origin ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }} # 创建新分支
80+
git checkout temp_${{ inputs.upstream_sync_branch }}
81+
git branch -D origin/${{ inputs.target_sync_branch }} # 强制删除本地分支
82+
git branch ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }} # 创建新分支
8283
# 强制删除临时分支,没必要
8384
# git branch -D temp_${{ inputs.upstream_sync_branch }}
8485
# 推送新分支到远程仓库

0 commit comments

Comments
 (0)