Comments (5)
KFERMercer
commented on May 26, 2024
不要删除已有文件.
自动合并提交的ci无法得知哪些更改是需要保留的, 哪些是需要被覆盖的. 当出现合并冲突时, 会默认保留属于你的更改. 但是如果你删除文件, ci就无法操作.
其中涉及到git merge机制, 请自行了解.
自动合并ci能力有限, 不是, 也无法成为全能合并工具.
更新:
刚刚又看了下错误信息, 发现原因其实是lean的库更新了workflow, 但是GitHub Actions不允许用workflow来修改workflow, 也就是常说的 "禁止套娃", 所以这个问题很蛋疼...
解决方案1: 自己在本地手动合并lean的修改.
解决方案2: 删库重新fork
from openwrt-ci.
db-one
commented on May 26, 2024
ok,明白，那干脆就还在原有文件上进行修改了
from openwrt-ci.
db-one
commented on May 26, 2024
感谢大佬解答
是不是也就是说即便我保持openwrt-ci.yml文件不变，但是只要修改过，或者新增了Merge-Upstream.yml这个工作文件，也一样会导致这个错误？
from openwrt-ci.
adaaaaaa
commented on May 26, 2024
解决方案1: 自己在本地手动合并lean的修改.
是不是要改到和lede里面的workflow一样？？🤪🤪🤪
Merge-Upstream.yml要改吗？怎么弄？
from openwrt-ci.
adaaaaaa
commented on May 26, 2024
"禁止套娃"
因为github限制，已经无法再自动更新了？
from openwrt-ci.
Related Issues (20)
- 定制了插件，但编译后的固件没有SSR插件？ HOT 8
- 关于要去除的#号 和编译后出现的错误和没有ssr-plus HOT 2
- 添加固件上传到奶牛快传或者wetransfer的选项
- 关于添加luci-app-adguardhome
- 能说下 最新版 变更了那些功能 或者设置吗 没有看懂
- 请问一下我要触发openwrt官方分支的工作流
- 获取不了ip?
- 编译出错是哪里的问题呀
- 使用编译成功,但没有 ＄＄Ｒ，求教，怎么搞出来
- 定制固件 新版openwrt-ci.yml 需要如何设置呀 原来客制化无效
- 请问配置文件不需要指定内核版本吗 HOT 2
- ci编译后，19,07官方git，怎么1.3g那么多，lede里的action那个都没这么多 HOT 1
- merge-upstream.yml 这两天失败了 HOT 2
- 配置文件建议与openwrt.yml分离
- space cleanup 出错
- 怎么不能定制插件了呢？
- 大佬们帮忙看看是什么错误了 HOT 1
- Merge-upstream合并lean源码错误
- 定时任务不起作用
- 运行merge-upstream.yml报错
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from openwrt-ci.