File tree 1 file changed +2
-6
lines changed
1 file changed +2
-6
lines changed Original file line number Diff line number Diff line change 68
68
git fetch upstream ${{ inputs.upstream_sync_branch }}:temp_${{ inputs.upstream_sync_branch }}
69
69
# 基于临时分支创建新的本地分支
70
70
git checkout -b ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }}
71
- # 强制删除临时分支,没必要
72
- # git branch -D temp_${{ inputs.upstream_sync_branch }}
73
71
# 推送新分支到远程仓库
74
72
git push origin ${{ inputs.target_sync_branch }}
75
73
else
80
78
git checkout temp_${{ inputs.upstream_sync_branch }}
81
79
git branch -D ${{ inputs.target_sync_branch }} # 强制删除本地分支
82
80
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 }}
87
83
fi
88
84
89
85
# # REQUIRED step
You can’t perform that action at this time.
0 commit comments