Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lightning: do resolve conflict job when other lightning has local dupes (#41157) #41487

Merged
merged 2 commits into from
Mar 30, 2023
Merged

lightning: do resolve conflict job when other lightning has local dupes (#41157) #41487

merged 2 commits into from
Mar 30, 2023

Commits on Feb 16, 2023

  1. This is an automated cherry-pick of pingcap#41157 

    Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
    @lichunzhu @ti-chi-bot
    lichunzhu authored and ti-chi-bot committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    20f5059 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. resolve conflict

    @lichunzhu
    lichunzhu committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    c78930b View commit details
    Browse the repository at this point in the history