We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 57d7fd4 commit 29d0de3Copy full SHA for 29d0de3
.github/workflows/sync.yml
@@ -77,7 +77,7 @@ 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
- ggit checkout ${{ inputs.target_sync_branch }}
+ git checkout ${{ inputs.target_sync_branch }}
81
# 合并,使用传入解决合并冲突
82
git merge --strategy-option theirs temp_${{ inputs.upstream_sync_branch }}
83
# 强制删除临时分支,没必要
0 commit comments