import into support conflict resolution

[D3Hunter]

First-time contributors' checklist

• [x] I've signed the Contributor License Agreement, which is required for the repository owners to accept my contribution.

What is changed, added or deleted? (Required)

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.

• [ ] master (the latest development version)
• [ ] v9.0 (TiDB 9.0 versions)
• [x] v8.5 (TiDB 8.5 versions)
• [ ] v8.1 (TiDB 8.1 versions)
• [ ] v7.5 (TiDB 7.5 versions)
• [ ] v7.1 (TiDB 7.1 versions)
• [ ] v6.5 (TiDB 6.5 versions)
• [ ] v6.1 (TiDB 6.1 versions)
• [ ] v5.4 (TiDB 5.4 versions)

What is the related PR or file link(s)?

• This PR is translated from:
• Other reference link(s):

Do your changes match any of the following descriptions?

• [ ] Delete files
• [ ] Change aliases
• [ ] Need modification after applied to another branch
• [ ] Might cause conflicts after applied to another branch

[gemini-code-assist[bot]]

Summary of Changes

Hello @D3Hunter, I'm Gemini Code Assist[^1]! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the documentation for the IMPORT INTO SQL statement in TiDB, focusing on its conflict resolution capabilities. The updates clarify how primary key and unique index conflicts are automatically handled when using Global Sort in TiDB v8.5.5 and newer versions. The changes include detailed explanations, practical examples, and information on how to monitor and access data related to conflicted rows, ensuring users have a comprehensive understanding of this feature.

Highlights

• Updated IMPORT INTO Conflict Handling: The documentation for the IMPORT INTO statement has been updated to reflect new behavior regarding primary key and unique index conflicts. Specifically, for TiDB versions v8.5.5 and later, when using Global Sort, IMPORT INTO can now automatically handle these conflicts by removing conflicting rows.
• New Conflict Resolution Section: A new section titled 'Conflict resolution' has been added, providing detailed explanations and an example of how IMPORT INTO processes data with conflicts when Global Sort is enabled. This includes a demonstration of the IMPORT INTO command and the resulting table state.
• Conflicted Rows Information: Another new section, 'Conflicted rows info when using Global Sort', has been introduced. This section clarifies how the number of conflicted rows is displayed in the Result_Message column of SHOW IMPORT output and provides guidance on where to find the detailed conflicted row data in cloud storage.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with :thumbsup: and :thumbsdown: on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

[^1]: Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

[alastori]

LGTM

[ti-chi-bot[bot]]

[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 ask for approval from qiancai. 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.

Needs approval from an approver in each of these files:

• OWNERS

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[bot]]

[LGTM Timeline notifier]

Timeline:

• 2025-12-12 03:03:23.035581909 +0000 UTC m=+1182947.849359471: :ballot_box_with_check: agreed by GMHDBJD.
• 2025-12-15 07:51:46.246213549 +0000 UTC m=+1459451.059991141: :ballot_box_with_check: agreed by qiancai.