浩彬
浩彬
主要是我希望能够自由改变小窗口的尺寸
https://github.com/666ghj/BettaFish/pull/320#issuecomment-3519851473 https://github.com/666ghj/BettaFish/pull/320#issuecomment-3519854033 我已经这两个文件恢复成仓库 main 分支里的版本，然后再提交一次了： [chore: 恢复爬虫配置文件为仓库默认值](https://github.com/666ghj/BettaFish/pull/320/commits/87a201675ccc5a2fd132e36d9057919a78d0cab0) 可以放心合并了
好的，我明白了
> git checkout -q --track upstream/dev fatal: Unable to create 'D:/编程/BettaFish/.git/index.lock': File exists. Another git process seems to be running in this repository, e.g. an editor opened by 'git commit'....
好了，我重新提交了 基于 dev 的更改