拉去更改 #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

yuanzhou029 wants to merge 4 commits into su-kaka:master from yuanzhou029:master

+77 −4

yuanzhou029 commented Feb 6, 2026

同步

yuanzhou029 and others added 4 commits

December 25, 2025 15:24


          Create docker-hub.yml

55e5296


          Update docker-hub.yml

8bef29c


          Merge branch 'su-kaka:master' into master

de7e9dc


          chore: update version.txt [skip ci]

aecbeb8

snouker commented Feb 6, 2026

何意味?

同步冲突请在本地使用git同步上游,根据提示解决冲突部分后push到自己的分支(具体操作请百度).而不是要求上游来同步到你的分支
如果是增加 docker-hub.yml ,应该避免修改无关内容( version.txt ),并使用恰当的标题与描述

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

Labels

None yet