Skip to content

fork sync: merge conflicts with upstream/main #2

Description

@github-actions

定时同步失败:合并冲突

upstream/main 合入 test 时发生冲突,本次未推送。冲突文件:

  • src/bridge.ts
  • src/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.ts
  • src/x.ts

Please manually execute git fetch upstream && git merge upstream/main to resolve, then push back to this branch.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions