From 5e46617b70b6e7861c517cd49e6b4a6cf60ce35d Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Thu, 10 Mar 2022 15:52:55 +0800
Subject: [PATCH] Update README.md

---
 README.md            | 4 +---
 docs/ru/README.md    | 4 +---
 docs/zh-CN/README.md | 6 ++----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 385825b..9accac8 100644
--- a/README.md
+++ b/README.md
@@ -56,11 +56,9 @@ theme: next
 
 ## Configuration
 
-At present, NexT encourages users to use the [Alternate Theme Config][docs-configuration-url] to configure NexT. And it's easy to customize the layout or style of NexT using [Custom Files][docs-custom-files-url].
-
 It is not recommended to directly modify any files in the NexT theme. Because this may cause errors (e.g. merge conflicts), and the modified files may be discarded when upgrading the theme.
 
-However, you can bypass merge conflicts (error message like **«Commit your changes or stash them before you can merge»**) by using the `Commit`, `Stash` or `Reset` commands for local changes. See [here](https://stackoverflow.com/a/15745424/5861495) how to do it.
+At present, NexT encourages users to use the [Alternate Theme Config][docs-configuration-url] to configure NexT. And it's easy to customize the layout or style of NexT using [Custom Files][docs-custom-files-url].
 
 ## Plugins
 
diff --git a/docs/ru/README.md b/docs/ru/README.md
index 811aeb3..8be6ee5 100644
--- a/docs/ru/README.md
+++ b/docs/ru/README.md
@@ -56,11 +56,9 @@ theme: next
 
 ## Configuration
 
-At present, NexT encourages users to use the [Alternate Theme Config][docs-configuration-url] to configure NexT. And it's easy to customize the layout or style of NexT using [Custom Files][docs-custom-files-url].
-
 It is not recommended to directly modify any files in the NexT theme. Because this may cause errors (e.g. merge conflicts), and the modified files may be discarded when upgrading the theme.
 
-However, you can bypass merge conflicts (error message like **«Commit your changes or stash them before you can merge»**) by using the `Commit`, `Stash` or `Reset` commands for local changes. See [here](https://stackoverflow.com/a/15745424/5861495) how to do it.
+At present, NexT encourages users to use the [Alternate Theme Config][docs-configuration-url] to configure NexT. And it's easy to customize the layout or style of NexT using [Custom Files][docs-custom-files-url].
 
 ## Плагины
 
diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md
index faf3189..35b8bc3 100644
--- a/docs/zh-CN/README.md
+++ b/docs/zh-CN/README.md
@@ -56,12 +56,10 @@ theme: next
 
 ## 配置
 
+我们不推荐直接修改 NexT 主题的文件。因为这可能导致错误（例如 git merge 冲突），并且在升级主题时修改的文件可能丢失。
+
 目前 NexT 鼓励用户使用 [Alternate Theme Config][docs-configuration-url] 进行配置。并且可以轻松地通过 [Custom Files][docs-custom-files-url] 自定义主题的布局和样式。
 
-不推荐直接修改 NexT 主题的文件。因为这可能导致错误（例如 git merge 冲突），并且在升级主题时修改的文件可能丢失。
-
-然而你也可以通过提交（`Commit`）、贮藏（`Stash`）或忽视（`Discard`）本地更改以绕过这种更新错误（例如 **«Commit your changes or stash them before you can merge»**）。具体方法请参考[这里](https://stackoverflow.com/a/15745424/5861495)。
-
 ## 插件
 
 插件丰富和拓展了 NexT 的功能。这些插件分为两种：核心插件和第三方插件。核心插件被 NexT 的基础功能所依赖。第三方插件提供了大量的可选功能。