Jerry/rc-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/rc-plugin.git synced 2025-10-14 16:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ feat: 完善更新提示

Browse Source
This commit is contained in:
zhiyu1998 2024-08-07 13:38:51 +08:00
parent 31eec68b6b
commit 5e95af2bd1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/update.js
View File

@ -167,14 +167,14 @@ export class update extends plugin {
await this.reply( await this.reply(
msg + msg +
`存在冲突：\n${errMsg}\n` + `存在冲突：\n${errMsg}\n` +
"请解决冲突后再更新，或者执行#强制更新，放弃本地修改", "请解决冲突后再更新，或者执行#R强制更新，放弃本地修改",
); );
} else if (stdout.includes("CONFLICT")) { } else if (stdout.includes("CONFLICT")) {
await this.reply([ await this.reply([
msg + "存在冲突\n", msg + "存在冲突\n",
errMsg, errMsg,
stdout, stdout,
"\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改", "\n请解决冲突后再更新，或者执行#R强制更新，放弃本地修改",
]); ]);
} else { } else {
await this.reply([errMsg, stdout]); await this.reply([errMsg, stdout]);