From 42ff5ef2034323f2b24e6e86f08c5d441647e36d Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 15 Mar 2023 11:22:39 +0800
Subject: [PATCH 1/2] This is an automated cherry-pick of #12890

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
---
 pd-control.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pd-control.md b/pd-control.md
index 2f4c25cf6fe6a..ac8835a8ad6d2 100644
--- a/pd-control.md
+++ b/pd-control.md
@@ -867,7 +867,28 @@ Usage:
     scheduler config balance-hot-region-scheduler set enable-for-tiflash true
     ```
 
+<<<<<<< HEAD
 ### `store [delete | label | weight | remove-tombstone | limit ] <store_id>  [--jq="<query string>"]`
+=======
+### `service-gc-safepoint`
+
+Use this command to query the current GC safepoint and service GC safepoint. The output is as follows:
+
+```bash
+{
+  "service_gc_safe_points": [
+    {
+      "service_id": "gc_worker",
+      "expired_at": 9223372036854775807,
+      "safe_point": 439923410637160448
+    }
+  ],
+  "gc_safe_point": 0
+}
+```
+
+### `store [delete | cancel-delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
+>>>>>>> d9dd006dd (pd control: add service-gc-safepoint command (#12890))
 
 Use this command to view the store information or remove a specified store. For a jq formatted output, see [jq-formatted-json-output-usage](#jq-formatted-json-output-usage).
 

From f94facead0abe6677d17c3e5f85c4b4871bdd580 Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 15 Mar 2023 11:29:01 +0800
Subject: [PATCH 2/2] Update pd-control.md

---
 pd-control.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pd-control.md b/pd-control.md
index ac8835a8ad6d2..1fb2f8eca0905 100644
--- a/pd-control.md
+++ b/pd-control.md
@@ -867,9 +867,6 @@ Usage:
     scheduler config balance-hot-region-scheduler set enable-for-tiflash true
     ```
 
-<<<<<<< HEAD
-### `store [delete | label | weight | remove-tombstone | limit ] <store_id>  [--jq="<query string>"]`
-=======
 ### `service-gc-safepoint`
 
 Use this command to query the current GC safepoint and service GC safepoint. The output is as follows:
@@ -887,8 +884,7 @@ Use this command to query the current GC safepoint and service GC safepoint. The
 }
 ```
 
-### `store [delete | cancel-delete | label | weight | remove-tombstone | limit ] <store_id> [--jq="<query string>"]`
->>>>>>> d9dd006dd (pd control: add service-gc-safepoint command (#12890))
+### `store [delete | label | weight | remove-tombstone | limit ] <store_id>  [--jq="<query string>"]`
 
 Use this command to view the store information or remove a specified store. For a jq formatted output, see [jq-formatted-json-output-usage](#jq-formatted-json-output-usage).