lightning: do resolve conflict job when other lightning has local dupes (#41157)#41487
Merged
ti-chi-bot merged 2 commits intopingcap:release-6.1from Mar 30, 2023
Merged
Conversation
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Member
Author
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. DetailsReviewer can indicate their review by submitting an approval review. |
3 tasks
12 tasks
sleepymole
approved these changes
Mar 29, 2023
lichunzhu
approved these changes
Mar 29, 2023
Contributor
|
/merge |
Member
Author
|
This pull request has been accepted and is ready to merge. DetailsCommit hash: c78930b |
Contributor
|
/run-all-tests |
Contributor
|
/retest |
Contributor
|
/run-unit-test |
Contributor
|
/retest |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated cherry-pick of #41157
What problem does this PR solve?
Issue Number: close #40923
Problem Summary:
What is changed and how it works?
do resolve conflict job when other lightning has local dupes.
Check List
Tests
Manully test failed ti-case.
Side effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.