Skip to content
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.

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

Msd lite更新中文配置,显示连接客户端 #518

Closed
wants to merge 3 commits into from

Conversation

lanchuansheng
Copy link
Contributor

感谢提交!
Msd lite更新中文配置,显示连接客户端;
请完成以下表格:(方括号内填 "x" 以选中)

  • 文件已经上传
  • 确认PR的目标分支是pending
  • 如果元数据仓库已经PR了请提供PR链接:

如果是全新软件:

  • 是否开源软件?
  • 代码仓库或者官方网站:
    image

@jjm2473 jjm2473 added this pull request to the merge queue Jan 21, 2025
@jjm2473 jjm2473 removed this pull request from the merge queue due to a manual request Jan 21, 2025
@jjm2473 jjm2473 marked this pull request as draft January 21, 2025 11:43
@jjm2473
Copy link
Collaborator

jjm2473 commented Jan 21, 2025

你的分支不是最新的,你这次变更 https://github.com/linkease/istore-repo/pull/518/files 包括了以前已经pr的文件 https://github.com/linkease/istore-repo/pull/512/files

@lanchuansheng
Copy link
Contributor Author

文件版本变了,必须修改软件包版本号和相应的文件名,不然无法更新。

主程序没有改变,改的事luci展示的包

@jjm2473
Copy link
Collaborator

jjm2473 commented Jan 21, 2025

对,但是你的文件列表却包括了主程序 https://github.com/linkease/istore-repo/pull/518/files ,很明显就是在一个分支上多次pr导致的。每次pr都应该先同步main分支,然后在main分支上创建pr用的分支来修改,不能使用以前已经pr过的分支。

@jjm2473
Copy link
Collaborator

jjm2473 commented Jan 21, 2025

打开这个 https://github.com/lanchuansheng/istore-repo/tree/main ,大概这个位置应该有个sync的按钮
image

@lanchuansheng
Copy link
Contributor Author

打开这个 https://github.com/lanchuansheng/istore-repo/tree/main ,大概这个位置应该有个sync的按钮 image

同步了

@jjm2473
Copy link
Collaborator

jjm2473 commented Jan 21, 2025

同步以后在main分支创建新分支再做变更,再pr。

@jjm2473
Copy link
Collaborator

jjm2473 commented Jan 21, 2025

相同包名的旧版本的ipk文件不需要删,流程会自动找到老版本删除。只要上传新ipk就行了

@lanchuansheng lanchuansheng marked this pull request as ready for review January 21, 2025 12:08
@lanchuansheng lanchuansheng deleted the msd_lite branch January 21, 2025 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants