From 2235d498ab10664e485946ed6f6c7169fd3bebb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Wed, 20 May 2026 09:56:53 +0300 Subject: [PATCH 1/2] This is an automated cherry-pick of #22840 Signed-off-by: ti-chi-bot --- dm/dm-overview.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dm/dm-overview.md b/dm/dm-overview.md index eeee54f22d995..b1c3b249ad41e 100644 --- a/dm/dm-overview.md +++ b/dm/dm-overview.md @@ -92,5 +92,10 @@ Before v5.4, the DM documentation is independent of the TiDB documentation. To a > **Note:** > +<<<<<<< HEAD > - Since October 2021, DM's GitHub repository has been moved to [pingcap/tiflow](https://github.com/pingcap/tiflow/tree/release-8.5/dm). If you see any issues with DM, submit your issue to the `pingcap/tiflow` repository for feedback. > - In earlier versions (v1.0 and v2.0), DM uses version numbers that are independent of TiDB. Since v5.3, DM uses the same version number as TiDB. The next version of DM v2.0 is DM v5.3. There are no compatibility changes from DM v2.0 to v5.3, and the upgrade process is the same as a normal upgrade, only an increase in version number. +======= +> - Since October 2021, DM's GitHub repository has been moved to [pingcap/tiflow](https://github.com/pingcap/tiflow/tree/master/dm). If you see any issues with DM, submit your issue to the `pingcap/tiflow` repository for feedback. +> - In earlier versions (v1.0 and v2.0), DM uses version numbers independent of TiDB. Starting from v5.3, DM uses the same version number as TiDB. DM v5.3 follows DM v2.0 with no compatibility changes, and the upgrade process is standard, involving only a version number increase. +>>>>>>> 5d9ab62116 (DM: Remove broken docs links (#22840)) From 49de843404a295b16ea861e028809995e8fb4453 Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Wed, 20 May 2026 15:16:36 +0800 Subject: [PATCH 2/2] Update dm/dm-overview.md Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- dm/dm-overview.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dm/dm-overview.md b/dm/dm-overview.md index b1c3b249ad41e..f40fd88ec0017 100644 --- a/dm/dm-overview.md +++ b/dm/dm-overview.md @@ -92,10 +92,5 @@ Before v5.4, the DM documentation is independent of the TiDB documentation. To a > **Note:** > -<<<<<<< HEAD -> - Since October 2021, DM's GitHub repository has been moved to [pingcap/tiflow](https://github.com/pingcap/tiflow/tree/release-8.5/dm). If you see any issues with DM, submit your issue to the `pingcap/tiflow` repository for feedback. -> - In earlier versions (v1.0 and v2.0), DM uses version numbers that are independent of TiDB. Since v5.3, DM uses the same version number as TiDB. The next version of DM v2.0 is DM v5.3. There are no compatibility changes from DM v2.0 to v5.3, and the upgrade process is the same as a normal upgrade, only an increase in version number. -======= > - Since October 2021, DM's GitHub repository has been moved to [pingcap/tiflow](https://github.com/pingcap/tiflow/tree/master/dm). If you see any issues with DM, submit your issue to the `pingcap/tiflow` repository for feedback. > - In earlier versions (v1.0 and v2.0), DM uses version numbers independent of TiDB. Starting from v5.3, DM uses the same version number as TiDB. DM v5.3 follows DM v2.0 with no compatibility changes, and the upgrade process is standard, involving only a version number increase. ->>>>>>> 5d9ab62116 (DM: Remove broken docs links (#22840))