feat(cherrypicker): add hold labels and comments when cp pr has conflicts #1192
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…icts Signed-off-by: wuhuizuo <[email protected]>
ti-chi-bot
bot
added
dco-signoff: yes
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1192 +/- ##
===========================================
- Coverage 80.47% 61.33% -19.14%
===========================================
Files 21 36 +15
Lines 3324 4402 +1078
===========================================
+ Hits 2675 2700 +25
- Misses 419 1466 +1047
- Partials 230 236 +6 ☔ View full report in Codecov by Sentry. |
Signed-off-by: wuhuizuo <[email protected]>
ti-chi-bot
bot
added
size/L
Signed-off-by: wuhuizuo <[email protected]>
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: purelind, wuhuizuo The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
[LGTM Timeline notifier]Timeline:
|
wuhuizuo
added a commit
to PingCAP-QE/ee-ops
that referenced
this pull request
Feb 6, 2025
- cherrypicker, ref: ti-community-infra/tichi#1192 - issue-triage, ref: ti-community-infra/tichi#1193 Signed-off-by: wuhuizuo <[email protected]>
ti-chi-bot bot
pushed a commit
to PingCAP-QE/ee-ops
that referenced
this pull request
Feb 6, 2025
- cherrypicker, ref: ti-community-infra/tichi#1192 - issue-triage, ref: ti-community-infra/tichi#1193 Signed-off-by: wuhuizuo <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request introduces enhancements to handle pull requests with conflicts more effectively in the
cherrypickerplugin. The main changes involve detecting conflicts in the pull request diff and updating the pull request status and comments accordingly.Conflict detection and handling:
isPrHasSoftConflictto check for conflict markers (<<<<<<<,=======,>>>>>>>) in the pull request diff. (F662793dL753R753)handlemethod to detect conflicts in newly created pull requests and adjust the response message to inform users about the conflicts./unholdcommand to remove the hold label once resolved.