定时同步失败:合并冲突
upstream/main 合入 test 时发生冲突,本次未推送。冲突文件:
请人工执行 git fetch upstream && git merge upstream/main 解决后推回该分支。
Translated Message
Original language: Chinese
Scheduled sync failed: merge conflicts
Merge conflicts occurred when merging upstream/main into test, not pushed this time. Conflicted files:
Please manually execute git fetch upstream && git merge upstream/main to resolve, then push back to this branch.
定时同步失败:合并冲突
upstream/main 合入
test时发生冲突,本次未推送。冲突文件:src/bridge.tssrc/x.ts请人工执行
git fetch upstream && git merge upstream/main解决后推回该分支。Translated Message
Original language: Chinese
Scheduled sync failed: merge conflicts
Merge conflicts occurred when merging upstream/main into
test, not pushed this time. Conflicted files:src/bridge.tssrc/x.tsPlease manually execute
git fetch upstream && git merge upstream/mainto resolve, then push back to this branch.