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

Merged
merged 12 commits into from
Feb 9, 2023
Merged

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

merged 12 commits into from
Feb 9, 2023

Commits on Feb 7, 2023

  1. fix bug, add integration test

    @lichunzhu
    lichunzhu committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    3415e09 View commit details
    Browse the repository at this point in the history

  2. fix

    @lichunzhu
    lichunzhu committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    c213677 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. fix integration test

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    db2cdf9 View commit details
    Browse the repository at this point in the history

  2. fix

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    b10400c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix40923

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    5536e01 View commit details
    Browse the repository at this point in the history

  4. fix data

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    69234af View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fix40923' of https://github.com/lichunzhu/tidb into fix… 

    …40923
    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    50b7296 View commit details
    Browse the repository at this point in the history

  6. fix test

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    8aecf0a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into fix40923

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    725e93e View commit details
    Browse the repository at this point in the history

  8. address comments

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    a4ebdee View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into fix40923

    @lichunzhu
    lichunzhu committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    43f5837 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Merge branch 'master' into fix40923

    @ti-chi-bot
    ti-chi-bot committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    1ae8307 View commit details
    Browse the repository at this point in the history