Clarify merge conflict resolution status in CDC integration test removal PR #4085
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.
Investigated merge conflict reported by @wuhuizuo in PR removing CDC integration test jobs. The branch is currently in a clean state with no conflict markers.
Current State Analysis:
prow-jobs/kustomization.yamlcontains no merge conflict markers1c84d30were resolved in commitse20b069andf8f091bpingcap_tiflash_release-9.0-beta-presubmits.yamlpingcap_tiflow_common-postsubmits.yamlpingcap_tiflow_latest-postsubmits.yamlPR Changes Summary:
pingcap_tiflow_latest-periodics.yaml(CDC Kafka/MySQL periodic jobs)pingcap_tidb_release-6.5-periodics.yamlti-community-infra_configs_periodics.yamlAwaiting clarification on specific conflict details as none are visible in the current branch state.
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.