You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Aug 15, 2023. It is now read-only.
Updating 982e96d..02f7bec
error: Your local changes to the following files would be overwritten by merge:
data/db/aby.json
data/db/artifact.json
data/db/authority.json
data/db/character.json
data/db/cookies.json
data/db/gacha.json
data/db/info.json
data/db/map.json
data/db/music.json
data/db/time.json
Please commit your changes or stash them before you merge.
Aborting
这个冲突在提交 02f7bec 中引入,但是我觉得是必要的,在这个提交之后数据文件就不影响仓库了。但是引入的问题是,当使用的代码比 02f7bec 更早时,更新代码会遇到以下报错。
你需要把
./data/db/*.json
移动到一个备份目录,更新后再移动回来。这个错误只需要解决一次,之后就不会有了。
The text was updated successfully, but these errors were encountered: