Skip to content

Commit 29d0de3

Browse files
committed
auto sync #3
1 parent 57d7fd4 commit 29d0de3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/sync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ 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-
ggit checkout ${{ inputs.target_sync_branch }}
80+
git checkout ${{ inputs.target_sync_branch }}
8181
# 合并,使用传入解决合并冲突
8282
git merge --strategy-option theirs temp_${{ inputs.upstream_sync_branch }}
8383
# 强制删除临时分支,没必要

0 commit comments

Comments
 (0)