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

Merged

ti-chi-bot merged 7 commits intopingcap:release-6.5from ti-chi-bot:cherry-pick-41157-to-release-6.5

Feb 17, 2023

+204-12

Commits on Feb 16, 2023

fix bug, add integration test

lichunzhu
authored and
ti-chi-bot
committed
fix

lichunzhu
authored and
ti-chi-bot
committed
fix integration test

lichunzhu
authored and
ti-chi-bot
committed
fix

lichunzhu
authored and
ti-chi-bot
committed
fix data

lichunzhu
authored and
ti-chi-bot
committed
fix test

lichunzhu
authored and
ti-chi-bot
committed
address comments

lichunzhu
authored and
ti-chi-bot
committed