fix custom conflicts

Signed-off-by: zhuxiujuan28 <562873187@qq.com>
2025-12-26 00:12:48 +00:00 · 2024-09-10 17:55:05 +08:00 · 2024-09-10 17:55:05 +08:00 · e5bb45dc75
parent 6fe0ecfae2
commit e5bb45dc75
45 changed files with 0 additions and 294 deletions
--- a/content/zh/_ks_components/code/codeEnd.adoc
+++ b/content/zh/_ks_components/code/codeEnd.adoc
@ -1 +0,0 @@
----
--- a/content/zh/docs/_custom/clusterManagement/podIpPools/podIpPools-prer-enablePodIpPool.adoc
+++ b/content/zh/docs/_custom/clusterManagement/podIpPools/podIpPools-prer-enablePodIpPool.adoc
@ -1,17 +1,9 @@
 // :ks_include_id: 07a04c60e8c342db9bc6ec8108be9412
 ifeval::["{file_output_type}" == "html"]
 * {ks_product_right}平台需要启用容器组 IP 池扩展组件。
-<<<<<<< HEAD
 有关更多信息，请参阅 xref:04-platform-management/01-extension-management/[启用可插拔组件]。
 endif::[]

 ifeval::["{file_output_type}" == "pdf"]
 有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-有关更多信息，请参阅 xref:04-platform-management/01-extension-management/_index.adoc[启用可插拔组件]。
-endif::[]
-
-ifeval::["{file_output_type}" == "pdf"]
-有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 endif::[]
--- a/content/zh/docs/_custom/clusterManagement/ruleGroups/ruleGroups-prer-creationPrerequisites.adoc
+++ b/content/zh/docs/_custom/clusterManagement/ruleGroups/ruleGroups-prer-creationPrerequisites.adoc
@ -7,10 +7,6 @@ endif::[]

 ifeval::["{file_output_type}" == "pdf"]

-<<<<<<< HEAD
 * {ks_product_right}平台需要启用告警系统扩展组件。关于更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-* {ks_product_right}平台需要启用告警系统扩展组件。关于更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 endif::[]
--- a/content/zh/docs/_custom/clusterManagement/workloads/createWorkload/workloads-desc-enableLogCollectionCluster.adoc
+++ b/content/zh/docs/_custom/clusterManagement/workloads/createWorkload/workloads-desc-enableLogCollectionCluster.adoc
@ -1,10 +1,6 @@
 // :ks_include_id: 01792eb26cce4187b5a1f964404e6037
 ifeval::["{file_output_type}" == "pdf"]

-<<<<<<< HEAD
 有关如何在项目中启用**收集卷上的日志**，请参阅《{ks_product_right}项目管理指南》的“日志收集”章节。
-=======
-有关如何在项目中启用**收集卷上的日志**，请参阅《{ks_product_full_right}项目管理指南》的“日志收集”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 endif::[]
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-addNodes.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-addNodes.adoc
@ -1,16 +1,8 @@
 // :ks_include_id: 6963bdcc859e4b46817de17172bb750a
 // Bash
-<<<<<<< HEAD
 [,bash]
 ----
  ./kk add nodes -f config-sample.yaml
 ----

 //  ./kk add nodes -f config-sample.yaml -a kubekey-artifact.tar.gz
-=======
-include::../../../_ks_components/code/bash.adoc[]
-
- ./kk add nodes -f config-sample.yaml -a kubekey-artifact.tar.gz
-
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-initializeRegistry.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-initializeRegistry.adoc
@ -4,8 +4,4 @@ include::../../../_ks_components/code/bash.adoc[]

  ./kk init registry -f config-sample.yaml -a kubekey-artifact.tar.gz

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-privateRegistry.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-privateRegistry.adoc
@ -7,8 +7,4 @@ include::../../../_ks_components/code/yaml.adoc[]
    insecureRegistries: []
    privateRegistry: dockerhub.kubekey.local

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-startUpgradeOffline.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-startUpgradeOffline.adoc
@ -4,8 +4,4 @@ include::../../../_ks_components/code/bash.adoc[]

  ./kk upgrade --with-kubernetes <Kubernetes version> --with-kubesphere <product version> -f config-sample.yaml -a kubekey-artifact.tar.gz

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-desc-installationSuccessOutput.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-desc-installationSuccessOutput.adoc
@ -24,8 +24,4 @@ NOTES:
 https://kubesphere.io             20xx-xx-xx xx:xx:xx
 #####################################################

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-checkInstallationLog.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-checkInstallationLog.adoc
@ -7,9 +7,5 @@ include::../../../_ks_components/code/bash.adoc[]

 kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-installer -o jsonpath='{.items[0].metadata.name}') -f

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage.adoc
@ -10,22 +10,14 @@ include::../../../_ks_components/code/bash.adoc[]

 tar -zxvf <package name>

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 // Bash
 include::../../../_ks_components/code/bash.adoc[]

 cd <directory>

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --

 . 执行以下命令为 KubeKey 二进制文件 **kk** 添加执行权限：
@ -36,9 +28,5 @@ include::../../../_ks_components/code/bash.adoc[]

 sudo chmod +x kk

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc
@ -21,11 +21,7 @@ include::../../../_ks_components/code/bash.adoc[]

 cd <directory>

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --

 . 执行以下命令为 KubeKey 二进制文件 **kk** 添加执行权限：
@ -36,9 +32,5 @@ include::../../../_ks_components/code/bash.adoc[]

 sudo chmod +x kk

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc
@ -4,74 +4,37 @@
 +
 --
 // Bash
-<<<<<<< HEAD
 [,bash]
 ----
 export KKZONE=cn
 ----
 --

-=======
-include::../../../_ks_components/code/bash.adoc[]
-
-export KKZONE=cn
-
-include::../../../_ks_components/code/codeEnd.adoc[]
--
-
-
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 . 执行以下命令下载 KubeKey 最新版本：
 +
 --
 // Bash
-<<<<<<< HEAD
 [,bash]
 ----
 curl -sfL https://get-kk.kubesphere.io | sh -
 ----
-=======
-include::../../../_ks_components/code/bash.adoc[]
-
-curl -sfL https://get-kk.kubesphere.io | sh -
-
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 下载完成后当前目录下将生成 KubeKey 二进制文件 **kk**。

 // Note
-<<<<<<< HEAD
 // include::../../../_ks_components/admonitions/note.adoc[]

 // 如果用于执行本节操作的集群节点无法连接互联网，您可以从互联网连接正常的设备手动link:https://github.com/kubesphere/kubekey/releases[下载 KubeKey] 然后将其传输到用于执行本节操作的集群节点。

 // include::../../../_ks_components/admonitions/admonEnd.adoc[]
 --
-=======
-include::../../../_ks_components/admonitions/note.adoc[]
-
-如果用于执行本节操作的集群节点无法连接互联网，您可以从互联网连接正常的设备手动link:https://github.com/kubesphere/kubekey/releases[下载 KubeKey] 然后将其传输到用于执行本节操作的集群节点。
-
-include::../../../_ks_components/admonitions/admonEnd.adoc[]
--
-// end::download-kubekey[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 . 执行以下命令为 KubeKey 二进制文件 **kk** 添加执行权限：
 +
 --
 // Bash
-<<<<<<< HEAD
 [,bash]
 ----
 sudo chmod +x kk
 ----
-=======
-include::../../../_ks_components/code/bash.adoc[]
-
-sudo chmod +x kk
-
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller.adoc
@ -9,22 +9,14 @@ include::../../../_ks_components/code/bash.adoc[]

 curl -L -O https://github.com/kubesphere/ks-installer/releases/download/{ks_product_ver}/kubesphere-installer.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 // Bash
 include::../../../_ks_components/code/bash.adoc[]

 curl -L -O https://github.com/kubesphere/ks-installer/releases/download/{ks_product_ver}/cluster-configuration.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 // Note
 include::../../../_ks_components/admonitions/note.adoc[]
@ -42,11 +34,7 @@ include::../../../_ks_components/code/bash.adoc[]

 sed -i "s#^\s*image: kubesphere.*/ks-installer:.*#        image: dockerhub.kubekey.local/kubesphere/ks-installer:v3.3.0#" kubesphere-installer.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --

 . 如果您的集群节点无法连接互联网，执行以下命令编辑 **cluster-configuration.yaml** 配置文件：
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller_new.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller_new.adoc
@ -9,22 +9,14 @@ include::../../../_ks_components/code/bash.adoc[]

 curl -L -O https://github.com/kubesphere/ks-installer/releases/download/v3.5.0/kubesphere-installer.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 // Bash
 include::../../../_ks_components/code/bash.adoc[]

 curl -L -O https://github.com/kubesphere/ks-installer/releases/download/v3.5.0/cluster-configuration.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 // Note
 include::../../../_ks_components/admonitions/note.adoc[]
@ -43,11 +35,7 @@ include::../../../_ks_components/code/bash.adoc[]
 sed -i "s#^\s*image: kubesphere.*/ks-installer:.*#     
 image: dockerhub.kubekey.local/kubesphere/ks-installer:v3.5.0#" kubesphere-installer.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --

 . 如果您的集群节点无法连接互联网，执行以下命令编辑 **cluster-configuration.yaml** 配置文件：
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts.adoc
@ -1,28 +0,0 @@
-// :ks_include_id: bc97a1c3d087413bba734c07a3edb221
-. 登录所有集群节点，执行以下命令编辑 **/etc/hosts** 文件：
-+
--
-// Bash
-include::../../../_ks_components/code/bash.adoc[]
-
-vi /etc/hosts
-
-<<<<<<< HEAD
----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
-
-在 **/etc/hosts** 文件中添加以下信息，从而为集群节点配置私有镜像服务的域名解析规则（将 <registry IP address> 替换成私有镜像服务的实际 IP 地址），然后保存文件：
-
-// Bash
-include::../../../_ks_components/code/bash.adoc[]
-
-<registry IP address> dockerhub.kubekey.local
-
-<<<<<<< HEAD
----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc
@ -7,11 +7,7 @@ include::../../../_ks_components/code/bash.adoc[]

 vi /etc/hosts

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 在 **/etc/hosts** 文件中添加以下信息，从而为集群节点配置私有镜像服务的域名解析规则（将 <registry IP address> 替换成私有镜像服务的实际 IP 地址，将私有镜像服务的默认地址 **dockerhub.kubekey.local** 替换为您的实际镜像仓库地址），然后保存文件：

@ -20,9 +16,5 @@ include::../../../_ks_components/code/bash.adoc[]

 <registry IP address> dockerhub.kubekey.local

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-initializeRegistry.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-initializeRegistry.adoc
@ -7,11 +7,7 @@ include::../../../_ks_components/code/bash.adoc[]

 vi config-sample.yaml

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 以下为部分示例配置文件，如需了解完整示例，请参阅link:https://github.com/kubesphere/kubekey/blob/master/docs/config-example.md[此文件]。

@ -66,11 +62,7 @@ spec:
    insecureRegistries: []
  addons: []

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3


 在 **spec:hosts** 参数下设置用于创建私有镜像服务的服务器的信息。
@ -85,11 +77,7 @@ include::../../../_ks_components/code/yaml.adoc[]
    registry:
    - <registry name>

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 将 **spec:registry:privateRegistry** 参数设置为私有镜像服务的地址 **dockerhub.kubekey.local**，然后保存文件。

@ -101,11 +89,7 @@ include::../../../_ks_components/code/yaml.adoc[]
    insecureRegistries: []
    privateRegistry: dockerhub.kubekey.local

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --

 . 执行以下命令初始化私有镜像服务：
@ -116,11 +100,7 @@ include::../../../_ks_components/code/bash.adoc[]

  ./kk init registry -f config-sample.yaml -a kubekey-artifact.tar.gz

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 include::installationAndUpgrade-note-initializeRegistry.adoc[]
 --
--- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc
+++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc
@ -4,8 +4,4 @@ include::../../../_ks_components/code/bash.adoc[]

  ./kk create cluster -f config-sample.yaml -a kubekey-artifact.tar.gz

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/multi-clusterProjectManagement/projectManagement-oper-openProjectPage.adoc
+++ b/content/zh/docs/_custom/multi-clusterProjectManagement/projectManagement-oper-openProjectPage.adoc
@ -1,2 +0,0 @@
-// :ks_include_id: 161aaad98ab04d7fa4240eec51d232f7
-. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product_left} Web 控制台并进入您的多集群项目。
--- a/content/zh/docs/_custom/multi-clusterProjectManagement/projectManagement-prer-requiredPermission.adoc
+++ b/content/zh/docs/_custom/multi-clusterProjectManagement/projectManagement-prer-requiredPermission.adoc
@ -1,2 +0,0 @@
-// :ks_include_id: a7b11e38d6794c2692390f9d0afbb7df
-您需要加入一个多集群项目并在项目中具有pass:a,q[{ks_permission}]权限。
--- a/content/zh/docs/_custom/platformManagement/appStoreManagement/appTemplates/appTemplates-para-templateCategories.adoc
+++ b/content/zh/docs/_custom/platformManagement/appStoreManagement/appTemplates/appTemplates-para-templateCategories.adoc
@ -1,7 +1,3 @@
 // :ks_include_id: 7f602e6e82414c39b2434c3a6ef39aa0
 |分类
-<<<<<<< HEAD
 |应用模板所属的分类。您可以将应用模板分配到一个分类中以便于管理。有关更多信息，请参阅xref:04-platform-management/05-app-store-management/02-app-categories/[应用分类]。
-=======
-|应用模板所属的分类。您可以将应用模板分配到一个分类中以便于管理。有关更多信息，请参阅xref:04-platform-management/05-app-store-management/02-app-categories/_index.adoc[应用分类]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-deleteStatusEs.adoc
+++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-deleteStatusEs.adoc
@ -9,8 +9,4 @@ status:
    enabledTime: 2022-08-11T06:22:01UTC
    status: enabled 

-<<<<<<< HEAD
 ----
-=======
-include::../../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-disableOberservabilityCenter.adoc
+++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-disableOberservabilityCenter.adoc
@ -18,9 +18,5 @@ status:
    enabledTime: XXXX-XX-XXXXX:XX:XXXXX
    status: enabled           #删除 monitoring:status:enabled

-<<<<<<< HEAD
 ----
-=======
-include::../../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-editCC.adoc
+++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-editCC.adoc
@ -7,9 +7,5 @@ include::../../../../_ks_components/code/bash.adoc[]

 kubectl edit cc ks-installer -n kubesphere-system

-<<<<<<< HEAD
 ----
-=======
-include::../../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-setExternalElasticsearch.adoc
+++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-setExternalElasticsearch.adoc
@ -11,11 +11,7 @@ spec:
      externalElasticsearchHost: "<Elasticsearch address>"
      externalElasticsearchPort: "<Elasticsearch port number>"

-<<<<<<< HEAD
 ----
-=======
-include::../../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 // Note
 include::../../../../_ks_components/admonitions/note.adoc[]
--- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-prer-platformAdmin.adoc
+++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-prer-platformAdmin.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 533e874085874479aae0d8bb598443f2
-<<<<<<< HEAD
 您需要在{ks_product_both}平台具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/[用户]和xref:04-platform-management/04-access-control/03-platform-roles/[平台角色]。
-=======
-您需要在{ks_product_both}平台具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/_index.adoc[用户]和xref:04-platform-management/04-access-control/03-platform-roles/_index.adoc[平台角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-obtainJwtsecret.adoc
+++ b/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-obtainJwtsecret.adoc
@ -7,9 +7,5 @@ include::../../../../../_ks_components/code/bash.adoc[]

 kubectl -n kubesphere-system get cm kubesphere-config -o yaml | grep -v "apiVersion" | grep jwtSecret

-<<<<<<< HEAD
 ----
-=======
-include::../../../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-platformAdminHostMemeber.adoc
+++ b/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-platformAdminHostMemeber.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: dea142b7ab3e4c6292a968da83aa19c0
-<<<<<<< HEAD
 * 您需要在主集群和成员集群中都具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/[用户]和xref:04-platform-management/04-access-control/03-platform-roles/[平台角色]。
-=======
-* 您需要在主集群和成员集群中都具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/_index.adoc[用户]和xref:04-platform-management/04-access-control/03-platform-roles/_index.adoc[平台角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission.adoc
+++ b/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission.adoc
@ -1,6 +0,0 @@
-// :ks_include_id: 95e415bcbafa45ed8545cb7700801b09
-<<<<<<< HEAD
-您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/[用户]和xref:04-platform-management/04-access-control/03-platform-roles/[平台角色]。
-=======
-您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/_index.adoc[用户]和xref:04-platform-management/04-access-control/03-platform-roles/_index.adoc[平台角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission_v4.adoc
+++ b/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission_v4.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 95e415bcbafa45ed8545cb7700801b09
-<<<<<<< HEAD
 您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅“用户”和“平台角色”。
-=======
-您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:05-users-and-roles/01-users/_index.adoc[用户]和xref:05-users-and-roles/02-platform-roles/_index.adoc[平台角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/pluggable-component-management/view-component-installation-log.adoc
+++ b/content/zh/docs/_custom/pluggable-component-management/view-component-installation-log.adoc
@ -8,9 +8,5 @@ include::../../../_ks_components/code/bash.adoc[]

 kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-install -o jsonpath='{.items[0].metadata.name}') -f

-<<<<<<< HEAD
 ----
-=======
-include::../../../_ks_components/code/codeEnd.adoc[]
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 --
--- a/content/zh/docs/_custom/projectManagement/grayscaleRelease/grayscaleRelease-prer-enableApplicationGovernance.adoc
+++ b/content/zh/docs/_custom/projectManagement/grayscaleRelease/grayscaleRelease-prer-enableApplicationGovernance.adoc
@ -7,10 +7,6 @@ endif::[]

 ifeval::["{file_output_type}" == "pdf"]

-<<<<<<< HEAD
 * {ks_product_right}平台需要启用应用治理扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-* {ks_product_right}平台需要启用应用治理扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 endif::[]
--- a/content/zh/docs/_custom/projectManagement/microservices/microservices-prer-enableSpringCloud.adoc
+++ b/content/zh/docs/_custom/projectManagement/microservices/microservices-prer-enableSpringCloud.adoc
@ -3,9 +3,5 @@ ifeval::["{file_output_type}" == "html"]
 * {ks_product_right}平台需要启用 Spring Cloud 扩展组件。
 endif::[]
 ifeval::["{file_output_type}" == "pdf"]
-<<<<<<< HEAD
 * {ks_product_right}平台需要启用 Spring Cloud 扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-* {ks_product_right}平台需要启用 Spring Cloud 扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 endif::[]
--- a/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission.adoc
+++ b/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 6579f3ef4c70439ca10c8e8de94ce9fb
-<<<<<<< HEAD
 您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:07-project-management/10-project-settings/04-project-members/[项目成员]和xref:07-project-management/10-project-settings/03-project-roles/02-view-a-project-role-list.adoc[项目角色]。
-=======
-您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:07-project-management/10-project-settings/04-project-members/_index.adoc[项目成员]和xref:07-project-management/10-project-settings/03-project-roles/02-view-a-project-role-list.adoc[项目角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission_new.adoc
+++ b/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission_new.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 6579f3ef4c70439ca10c8e8de94ce9fb
-<<<<<<< HEAD
 您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅“项目成员”和“项目角色”。
-=======
-您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:09-project-management/06-project-settings/03-project-members/_index.adoc[项目成员]和xref:09-project-management/06-project-settings/02-project-roles/_index.adoc[项目角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/projectManagement/services/services-desc-seeImageBuilder.adoc
+++ b/content/zh/docs/_custom/projectManagement/services/services-desc-seeImageBuilder.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 6113bcafa9264e92892a1889dbfe7330
-<<<<<<< HEAD
 有关镜像构建器的更多信息，请参阅xref:07-project-management/08-image-builder/[镜像构建器]。
-=======
-有关镜像构建器的更多信息，请参阅xref:07-project-management/08-image-builder/_index.adoc[镜像构建器]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionMulticlusterProject.adoc
+++ b/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionMulticlusterProject.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 716996e4cfe04beaa6a39a03ae610b86
-<<<<<<< HEAD
 有关如何在项目中启用**收集卷上的日志**，请参阅link:/Users/keke/works/pitrix/repo/ks-qkcp-docs/ks-qkcp/docs-zh/@ks-qkcp/docs-zh/08-multi-cluster-project-management/06-project-settings/04-log-collection/[日志收集]。
-=======
-有关如何在项目中启用**收集卷上的日志**，请参阅link:/Users/keke/works/pitrix/repo/ks-qkcp-docs/ks-qkcp/docs-zh/@ks-qkcp/docs-zh/08-multi-cluster-project-management/06-project-settings/04-log-collection/_index.adoc[日志收集]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionProject.adoc
+++ b/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionProject.adoc
@ -1,6 +1,2 @@
 // :ks_include_id: 7318136ea443449a9e862e964a41299f
-<<<<<<< HEAD
 有关如何在项目中启用**收集卷上的日志**，请参阅xref:07-project-management/10-project-settings/06-log-collection/[日志收集]。
-=======
-有关如何在项目中启用**收集卷上的日志**，请参阅xref:07-project-management/10-project-settings/06-log-collection/_index.adoc[日志收集]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/radondb/radondb-prer-enableDmp.adoc
+++ b/content/zh/docs/_custom/radondb/radondb-prer-enableDmp.adoc
@ -3,9 +3,5 @@ ifeval::["{file_output_type}" == "html"]
 * {ks_product_right}平台需要启用数据库管理平台扩展组件。
 endif::[]
 ifeval::["{file_output_type}" == "pdf"]
-<<<<<<< HEAD
 * {ks_product_right}平台需要启用数据库管理平台扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-* {ks_product_right}平台需要启用数据库管理平台扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
 endif::[]
--- a/content/zh/docs/_custom/workspaceManagement/appTemplates/appTemplates-prer-enableAppManagment.adoc
+++ b/content/zh/docs/_custom/workspaceManagement/appTemplates/appTemplates-prer-enableAppManagment.adoc
@ -7,10 +7,6 @@ endif::[]

 ifeval::["{file_output_type}" == "pdf"]

-<<<<<<< HEAD
 * {ks_product_right}平台需要启用应用管理扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-* {ks_product_right}平台需要启用应用管理扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 endif::[]
--- a/content/zh/docs/_custom/workspaceManagement/devopsProjects/devopsProject-prer-enableDevops.adoc
+++ b/content/zh/docs/_custom/workspaceManagement/devopsProjects/devopsProject-prer-enableDevops.adoc
@ -7,10 +7,6 @@ endif::[]

 ifeval::["{file_output_type}" == "pdf"]

-<<<<<<< HEAD
 * {ks_product_right}平台需要启用 DevOps 扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。
-=======
-* {ks_product_right}平台需要启用 DevOps 扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 endif::[]
--- a/content/zh/docs/_custom/workspaceManagement/toolBox/toolBox-prer-useLogQueryTools.adoc
+++ b/content/zh/docs/_custom/workspaceManagement/toolBox/toolBox-prer-useLogQueryTools.adoc
@ -11,14 +11,8 @@ endif::[]

 ifeval::["{file_output_type}" == "pdf"]

-<<<<<<< HEAD
 * {ks_product_right}平台需要启用日志、事件和审计扩展组件。有关更多信息，请参阅《{ks_product_both}平台管理指南》的“扩展组件管理”章节。

 * {ks_product_right}集群需要添加 Elasticsearch 日志接收器。有关更多信息，请参阅《{ks_product_right}集群管理指南》的“添加日志接收器”章节。
-=======
-* {ks_product_right}平台需要启用日志、事件和审计扩展组件。有关更多信息，请参阅《{ks_product_full_both}平台管理指南》的“扩展组件管理”章节。
-
-* {ks_product_right}集群需要添加 Elasticsearch 日志接收器。有关更多信息，请参阅《{ks_product_full_right}集群管理指南》的“添加日志接收器”章节。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3

 endif::[]
--- a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc
+++ b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc
@ -1,6 +0,0 @@
-// :ks_include_id: 05d7ebe027f04cc589e8baa04343e651
-<<<<<<< HEAD
-您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:06-workspace-management/06-workspace-settings/03-workspace-members/[企业空间成员]、xref:06-workspace-management/06-workspace-settings/04-workspace-roles/[企业空间角色]和xref:06-workspace-management/06-workspace-settings/05-departments/[部门]。
-=======
-您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:06-workspace-management/06-workspace-settings/03-workspace-members/_index.adoc[企业空间成员]、xref:06-workspace-management/06-workspace-settings/04-workspace-roles/_index.adoc[企业空间角色]和xref:06-workspace-management/06-workspace-settings/05-departments/_index.adoc[部门]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3
--- a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc
+++ b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc
@ -1,6 +0,0 @@
-// :ks_include_id: 05d7ebe027f04cc589e8baa04343e651
-<<<<<<< HEAD
-您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:08-workspace-management/05-workspace-settings/03-workspace-members/[企业空间成员]和xref:08-workspace-management/05-workspace-settings/04-workspace-roles/[企业空间角色]。
-=======
-您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:08-workspace-management/05-workspace-settings/03-workspace-members/_index.adoc[企业空间成员]和xref:08-workspace-management/05-workspace-settings/04-workspace-roles/_index.adoc[企业空间角色]。
->>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3