Started by GitHub push by ti-chi-bot[bot]00241022410249537495371.0332373323708277491349134115726e9dbc5ca96af5c460b6d42219578cbda5fa6f426e9dbc5ca96af5c460b6d42219578cbda5fa6f4origin/main26e9dbc5ca96af5c460b6d42219578cbda5fa6f426e9dbc5ca96af5c460b6d42219578cbda5fa6f4origin/main26e9dbc5ca96af5c460b6d42219578cbda5fa6f426e9dbc5ca96af5c460b6d42219578cbda5fa6f4origin/mainhttps://github.com/PingCAP-QE/ci.githttps://do.pingcap.net/jenkins/blue/organizations/jenkins/seed/detail/seed/1157/artifactshttps://do.pingcap.net/jenkins/blue/organizations/jenkins/seed/detail/seed/1157/changeshttps://do.pingcap.net/jenkins/blue/organizations/jenkins/seed/detail/seed/1157/https://do.pingcap.net/jenkins/blue/organizations/jenkins/seed/detail/seed/1157/testsfalse#11574953786474seed #11571157falsefalse11572498726SUCCESS1763969156916https://do.pingcap.net/jenkins/view/all/job/seed/1157/default-48gdrscripts/plugins/resolve_pr_conflicts.py26e9dbc5ca96af5c460b6d42219578cbda5fa6f41763969120000https://do.pingcap.net/jenkins/user/noreplynoreplynoreply@github.comfeat: add resolve_pr_conflicts.py to supprot ai-based merge conflict resolution (#3898) add resolve_pr_conflicts.py file to support AI-Powered automated conflict resolution for ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> 2025-11-24 07:25:20 +000026e9dbc5ca96af5c460b6d42219578cbda5fa6f4feat: add resolve_pr_conflicts.py to supprot ai-based merge conflictaddscripts/plugins/resolve_pr_conflicts.pygithttps://do.pingcap.net/jenkins/user/noreplynoreplynoreply