We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 3b9d9f5 commit 65df86eCopy full SHA for 65df86e
.github/workflows/sync.yml
@@ -77,8 +77,9 @@ jobs:
77
echo "Remote branch ${{ inputs.target_sync_branch }} exists."
78
# 创建一个临时分支来fetch远程分支的内容
79
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 }} # 创建新分支
+ git checkout temp_${{ inputs.upstream_sync_branch }}
+ git branch -D origin/${{ inputs.target_sync_branch }} # 强制删除本地分支
82
+ git branch ${{ inputs.target_sync_branch }} temp_${{ inputs.upstream_sync_branch }} # 创建新分支
83
# 强制删除临时分支,没必要
84
# git branch -D temp_${{ inputs.upstream_sync_branch }}
85
# 推送新分支到远程仓库
0 commit comments