Skip to content

fix: remove merge conflict artifact in clinic-user-guide-for-tiup.md#23165

Open
yahonda wants to merge 1 commit into
pingcap:i18n-ja-release-8.5from
yahonda:fix-conflict-remnant-i18n-ja
Open

fix: remove merge conflict artifact in clinic-user-guide-for-tiup.md#23165
yahonda wants to merge 1 commit into
pingcap:i18n-ja-release-8.5from
yahonda:fix-conflict-remnant-i18n-ja

Conversation

@yahonda

@yahonda yahonda commented Jun 29, 2026

Copy link
Copy Markdown
Member

Remove a stray line with conflict markers in clinic-user-guide-for-tiup.md that was left behind from a merge conflict resolution.

@ti-chi-bot

ti-chi-bot Bot commented Jun 29, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jackysp for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot Bot added missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 29, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request removes a line of placeholder progress characters (>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><>>>>>>>>>) from a bash command output block in the TiUP Clinic user guide (clinic/clinic-user-guide-for-tiup.md). There are no review comments, and I have no feedback to provide.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@qiancai

qiancai commented Jun 29, 2026

Copy link
Copy Markdown
Collaborator

@yahonda It looks like the English file has the stray line too, so the stray line removed from PR might not be caused by merge conflict resolution.

https://github.com/pingcap/docs/blob/master/clinic/clinic-user-guide-for-tiup.md?plain=1

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

missing-translation-status This PR does not have translation status info. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants