resolve conflicts

Signed-off-by: Aolin <aolin.zhang@pingcap.com>

deploy-monitoring-services.md

@@ -225,7 +225,7 @@ To import a Grafana dashboard for the PD server, the TiKV server, and the TiDB s
 
 2. In the sidebar menu, click **Dashboards** -> **Import** to open the **Import Dashboard** window.
 
-3. Click **Upload .json File** to upload a JSON file (Download TiDB Grafana configuration files from [pingcap/tidb](https://github.com/pingcap/tidb/tree/master/metrics/grafana), [tikv/tikv](https://github.com/tikv/tikv/tree/master/metrics/grafana), and [tikv/pd](https://github.com/tikv/pd/tree/master/metrics/grafana)).
+3. Click **Upload .json File** to upload a JSON file (Download TiDB Grafana configuration files from [pingcap/tidb](https://github.com/pingcap/tidb/tree/release-6.1/metrics/grafana), [tikv/tikv](https://github.com/tikv/tikv/tree/master/metrics/grafana), and [tikv/pd](https://github.com/tikv/pd/tree/master/metrics/grafana)).
 
     > **Note:**
     >

functions-and-operators/precision-math.md

@@ -50,7 +50,7 @@ DECIMAL columns do not store a leading `+` character or `-` character or leading
 
 DECIMAL columns do not permit values larger than the range implied by the column definition. For example, a `DECIMAL(3,0)` column supports a range of `-999` to `999`. A `DECIMAL(M,D)` column permits at most `M - D` digits to the left of the decimal point.
 
-For more information about the internal format of the DECIMAL values, see [`mydecimal.go`](https://github.com/pingcap/tidb/blob/master/types/mydecimal.go) in TiDB souce code.
+For more information about the internal format of the DECIMAL values, see [`mydecimal.go`](https://github.com/pingcap/tidb/blob/release-6.1/types/mydecimal.go) in TiDB souce code.
 
 ## Expression handling
 

maintain-tidb-using-tiup.md

@@ -112,7 +112,7 @@ When the cluster is in operation, if you need to modify the parameters of a comp
 
     **Use `.` to represent the hierarchy of the configuration items**.
 
-    For more information on the configuration parameters of components, refer to [TiDB `config.toml.example`](https://github.com/pingcap/tidb/blob/master/config/config.toml.example), [TiKV `config.toml.example`](https://github.com/tikv/tikv/blob/master/etc/config-template.toml), and [PD `config.toml.example`](https://github.com/tikv/pd/blob/master/conf/config.toml).
+    For more information on the configuration parameters of components, refer to [TiDB `config.toml.example`](https://github.com/pingcap/tidb/blob/release-6.1/config/config.toml.example), [TiKV `config.toml.example`](https://github.com/tikv/tikv/blob/master/etc/config-template.toml), and [PD `config.toml.example`](https://github.com/tikv/pd/blob/master/conf/config.toml).
 
 3. Rolling update the configuration and restart the corresponding components by running the `reload` command:
 
@@ -124,7 +124,7 @@ When the cluster is in operation, if you need to modify the parameters of a comp
 
 ### Example
 
-If you want to set the transaction size limit parameter (`txn-total-size-limit` in the [performance](https://github.com/pingcap/tidb/blob/master/config/config.toml.example) module) to `1G` in tidb-server, edit the configuration as follows:
+If you want to set the transaction size limit parameter (`txn-total-size-limit` in the [performance](https://github.com/pingcap/tidb/blob/release-6.1/config/config.toml.example) module) to `1G` in tidb-server, edit the configuration as follows:
 
 ```
 server_configs:

performance-tuning-methods.md

@@ -453,6 +453,6 @@ For the `Store` thread, `Commit Log Duration` is obviously higher than `Apply Lo
 
 ## If my TiDB version is earlier than v6.1.0, what should I do to use the Performance Overview dashboard?
 
-Starting from v6.1.0, Grafana has a built-in Performance Overview dashboard by default. This dashboard is compatible with TiDB v4.x and v5.x versions. If your TiDB is earlier than v6.1.0, you need to manually import [`performance_overview.json`](https://github.com/pingcap/tidb/blob/master/metrics/grafana/performance_overview.json), as shown in the following figure:
+Starting from v6.1.0, Grafana has a built-in Performance Overview dashboard by default. This dashboard is compatible with TiDB v4.x and v5.x versions. If your TiDB is earlier than v6.1.0, you need to manually import [`performance_overview.json`](https://github.com/pingcap/tidb/blob/release-6.1/metrics/grafana/performance_overview.json), as shown in the following figure:
 
 ![Store](/media/performance/import_dashboard.png)

production-deployment-using-tiup.md

@@ -290,7 +290,7 @@ The following examples cover seven common scenarios. You need to modify the conf
 
 For more configuration description, see the following configuration examples:
 
-- [TiDB `config.toml.example`](https://github.com/pingcap/tidb/blob/master/config/config.toml.example)
+- [TiDB `config.toml.example`](https://github.com/pingcap/tidb/blob/release-6.1/config/config.toml.example)
 - [TiKV `config.toml.example`](https://github.com/tikv/tikv/blob/master/etc/config-template.toml)
 - [PD `config.toml.example`](https://github.com/pingcap/pd/blob/master/conf/config.toml)
 - [TiFlash `config.toml.example`](https://github.com/pingcap/tiflash/blob/master/etc/config-template.toml)

tidb-binlog/binlog-consumer-client.md

@@ -117,11 +117,11 @@ message Binlog {
 }
 ```
 
-For the definition of the data format, see [`secondary_binlog.proto`](https://github.com/pingcap/tidb/blob/master/tidb-binlog/proto/proto/secondary_binlog.proto)
+For the definition of the data format, see [`secondary_binlog.proto`](https://github.com/pingcap/tidb/blob/release-6.1/tidb-binlog/proto/proto/secondary_binlog.proto)
 
 ### Driver
 
-The [TiDB-Tools](https://github.com/pingcap/tidb-tools/) project provides [Driver](https://github.com/pingcap/tidb/tree/master/tidb-binlog/driver), which is used to read the binlog data in Kafka. It has the following features:
+The [TiDB-Tools](https://github.com/pingcap/tidb-tools/) project provides [Driver](https://github.com/pingcap/tidb/tree/release-6.1/tidb-binlog/driver), which is used to read the binlog data in Kafka. It has the following features:
 
 * Read the Kafka data.
 * Locate the binlog stored in Kafka based on `commit ts`.

tidb-configuration-file.md

@@ -9,7 +9,7 @@ aliases: ['/docs/stable/reference/configuration/tidb-server/configuration-file/'
 
 # TiDB Configuration File
 
-The TiDB configuration file supports more options than command-line parameters. You can download the default configuration file [`config.toml.example`](https://github.com/pingcap/tidb/blob/master/config/config.toml.example) and rename it to `config.toml`. This document describes only the options that are not involved in [command line options](/command-line-flags-for-tidb-configuration.md).
+The TiDB configuration file supports more options than command-line parameters. You can download the default configuration file [`config.toml.example`](https://github.com/pingcap/tidb/blob/release-6.1/config/config.toml.example) and rename it to `config.toml`. This document describes only the options that are not involved in [command line options](/command-line-flags-for-tidb-configuration.md).
 
 > **Tip:**
 >

troubleshoot-lock-conflicts.md

@@ -323,7 +323,7 @@ Solutions:
 
 ### TTL manager has timed out
 
-The transaction execution time cannot exceed the GC time limit. In addition, the TTL time of pessimistic transactions has an upper limit, whose default value is 1 hour. Therefore, a pessimistic transaction executed for more than 1 hour will fail to commit. This timeout threshold is controlled by the TiDB parameter [performance.max-txn-ttl](https://github.com/pingcap/tidb/blob/master/config/config.toml.example).
+The transaction execution time cannot exceed the GC time limit. In addition, the TTL time of pessimistic transactions has an upper limit, whose default value is 1 hour. Therefore, a pessimistic transaction executed for more than 1 hour will fail to commit. This timeout threshold is controlled by the TiDB parameter [`performance.max-txn-ttl`](https://github.com/pingcap/tidb/blob/release-6.1/config/config.toml.example).
 
 When the execution time of a pessimistic transaction exceeds the TTL time, the following error message occurs in the TiDB log: