From 0eca9605b771f140a9399d9f71f991260951b262 Mon Sep 17 00:00:00 2001 From: Guan Yuankai Date: Mon, 15 Dec 2025 15:43:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(scope):=20README=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复了README中一处代码段错误。 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index daca437..354a3c6 100644 --- a/README.md +++ b/README.md @@ -109,9 +109,11 @@ git rebase origin/develop 手动修改冲突文件。 +```Bash git add <冲突文件> git rebase --continue +``` 绝对禁止 在此处使用 git merge,这会产生无意义的 Merge Commit 节点。