update tidb.net and asktug links (#22496)#22771
update tidb.net and asktug links (#22496)#22771ti-chi-bot wants to merge 2 commits intopingcap:release-5.4from
Conversation
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot
added
do-not-merge/hold
|
@qiancai This PR has conflicts, I have hold it. |
|
@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository. |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates community links and forum references across several documentation files. A critical issue was identified in explore-htap.md where unresolved merge conflict markers were accidentally committed, and 'GitHub' was incorrectly capitalized. A review comment provides a suggestion to remove the markers and fix the branding.
| <<<<<<< HEAD | ||
| You are also welcome to create [Github Issues](https://github.com/pingcap/tiflash/issues) or submit your questions on [AskTUG](https://asktug.com/). | ||
| ======= | ||
| You are also welcome to create [GitHub Issues](https://github.com/pingcap/tiflash/issues) or ask the community on [Discord](https://discord.gg/DQZ2dy3cuc?utm_source=doc) or [Slack](https://slack.tidb.io/invite?team=tidb-community&channel=everyone&ref=pingcap-docs). | ||
| >>>>>>> 55c4473953 (update tidb.net and asktug links (#22496)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers. Please resolve the conflict by selecting the appropriate community channels and removing the markers. Additionally, ensure 'GitHub' is capitalized correctly as per standard branding.
| <<<<<<< HEAD | |
| You are also welcome to create [Github Issues](https://github.com/pingcap/tiflash/issues) or submit your questions on [AskTUG](https://asktug.com/). | |
| ======= | |
| You are also welcome to create [GitHub Issues](https://github.com/pingcap/tiflash/issues) or ask the community on [Discord](https://discord.gg/DQZ2dy3cuc?utm_source=doc) or [Slack](https://slack.tidb.io/invite?team=tidb-community&channel=everyone&ref=pingcap-docs). | |
| >>>>>>> 55c4473953 (update tidb.net and asktug links (#22496)) | |
| You are also welcome to create [GitHub Issues](https://github.com/pingcap/tiflash/issues) or ask the community on [Discord](https://discord.gg/DQZ2dy3cuc?utm_source=doc) or [Slack](https://slack.tidb.io/invite?team=tidb-community&channel=everyone&ref=pingcap-docs). |
References
- Correct English grammar, spelling, and punctuation mistakes. (link)
qiancai
removed
the
do-not-merge/hold
|
/approve |
|
/approve |
1 similar comment
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: qiancai The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
2 participants
This is an automated cherry-pick of #22496
What is changed, added or deleted? (Required)
tidb.net/blog -> pingkai.cn/tidbcommunity/blog
asktug.com -> pingkai.cn/tidbcommunity/forum
tidb.net -> pingkai.cn/tidbcommunity
search.asktug.com -> https://search.pingkai.cn
Which TiDB version(s) do your changes apply to? (Required)
Tips for choosing the affected version(s):
By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.
For details, see tips for choosing the affected versions (in Chinese).
What is the related PR or file link(s)?
Related issue: pingcap/tidb#65813
Do your changes match any of the following descriptions?