tidb icon indicating copy to clipboard operation
tidb copied to clipboard

importinto: add doc for conflict resolve

Open D3Hunter opened this issue 2 weeks ago • 9 comments

What problem does this PR solve?

Issue Number: ref #60621

Problem Summary:

What changed and how does it work?

Check List

Tests

  • [ ] Unit test
  • [ ] Integration test
  • [ ] Manual test (add detailed scripts or steps below)
  • [x] No need to test. ONLY add tech doc
    • [x] I checked and no code files have been changed.

Side effects

  • [ ] Performance regression: Consumes more CPU
  • [ ] Performance regression: Consumes more Memory
  • [ ] Breaking backward compatibility

Documentation

  • [ ] Affects user behaviors
  • [ ] Contains syntax changes
  • [ ] Contains variable changes
  • [ ] Contains experimental features
  • [ ] Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

D3Hunter avatar Dec 11 '25 07:12 D3Hunter

Hi @D3Hunter. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions 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 kubernetes-sigs/prow repository.

tiprow[bot] avatar Dec 11 '25 07:12 tiprow[bot]

/retest

D3Hunter avatar Dec 11 '25 07:12 D3Hunter

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions 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 kubernetes-sigs/prow repository.

tiprow[bot] avatar Dec 11 '25 07:12 tiprow[bot]

Codecov Report

:white_check_mark: All modified and coverable lines are covered by tests. :white_check_mark: Project coverage is 68.7466%. Comparing base (dc7e08f) to head (708bb46). :warning: Report is 7 commits behind head on master.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #64987        +/-   ##
================================================
- Coverage   70.9257%   68.7466%   -2.1791%     
================================================
  Files          1888       1866        -22     
  Lines        515892     509386      -6506     
================================================
- Hits         365900     350186     -15714     
- Misses       125576     136878     +11302     
+ Partials      24416      22322      -2094     
Flag Coverage Δ
integration 41.6438% <ø> (-6.5101%) :arrow_down:
unit 65.9743% <ø> (+0.3224%) :arrow_up:

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.8700% <ø> (ø)
parser ∅ <ø> (∅)
br 39.1471% <ø> (-20.2606%) :arrow_down:
:rocket: New features to boost your workflow:
  • :snowflake: Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • :package: JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

codecov[bot] avatar Dec 11 '25 08:12 codecov[bot]

/retest

D3Hunter avatar Dec 11 '25 08:12 D3Hunter

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions 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 kubernetes-sigs/prow repository.

tiprow[bot] avatar Dec 11 '25 08:12 tiprow[bot]

/retest

D3Hunter avatar Dec 11 '25 16:12 D3Hunter

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions 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 kubernetes-sigs/prow repository.

tiprow[bot] avatar Dec 11 '25 16:12 tiprow[bot]

@lance6716 ptal

D3Hunter avatar Dec 12 '25 02:12 D3Hunter

[LGTM Timeline notifier]

Timeline:

  • 2025-12-11 08:52:55.482158066 +0000 UTC m=+1117520.295935628: :ballot_box_with_check: agreed by fzzf678.
  • 2025-12-12 02:46:51.223631545 +0000 UTC m=+1181956.037409137: :ballot_box_with_check: agreed by lance6716.

ti-chi-bot[bot] avatar Dec 12 '25 02:12 ti-chi-bot[bot]

/unhold

D3Hunter avatar Dec 12 '25 07:12 D3Hunter

/approve

D3Hunter avatar Dec 12 '25 07:12 D3Hunter

/retest

D3Hunter avatar Dec 12 '25 07:12 D3Hunter

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, fzzf678, lance6716

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

The pull request process is described here

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[bot] avatar Dec 12 '25 07:12 ti-chi-bot[bot]

@D3Hunter: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions 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 kubernetes-sigs/prow repository.

tiprow[bot] avatar Dec 12 '25 07:12 tiprow[bot]