feat: add label in case of conflict #652
Conversation
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
ti-chi-bot
added
the
dco-signoff: yes
ti-chi-bot
added
the
size/XS
|
🎊 PR Preview 659519b has been successfully built and deployed to https://ti-community-infra-tichi-preview-pr-652.surge.sh 🕐 Build time: 0.011s
🤖 By surge-preview |
Codecov Report
@@ Coverage Diff @@
## master #652 +/- ##
==========================================
- Coverage 80.35% 80.25% -0.10%
==========================================
Files 17 17
Lines 2341 2345 +4
==========================================
+ Hits 1881 1882 +1
- Misses 304 306 +2
- Partials 156 157 +1
Continue to review full report at Codecov.
|
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
|
/merge @hi-rustin, Thanks~ |
|
This pull request has been accepted and is ready to merge. Commit hash: 659519b
|
ti-chi-bot
added
the
status/can-merge
{"job":{"type":"presubmit","job":"pull-tichi-rerere","buildid":"1417388340092604416","prowjobid":"6da45be6-e92d-11eb-97fe-f65bbdc45105","refs":{"org":"ti-community-infra","repo":"tichi","repo_link":"https://github.com/ti-community-infra/tichi","base_ref":"master","base_sha":"26788bf661c8dfb14ec08ab029c7896497b36dd8","base_link":"https://github.com/ti-community-infra/tichi/commit/26788bf661c8dfb14ec08ab029c7896497b36dd8","pulls":[{"number":652,"author":"hi-rustin","sha":"659519b90c5a39ad375c89793e852670818c7380","link":"https://github.com/ti-community-infra/tichi/pull/652","commit_link":"https://github.com/ti-community-infra/tichi/pull/652/commits/659519b90c5a39ad375c89793e852670818c7380","author_link":"https://github.com/hi-rustin"}]},"decoration_config":{"utility_images":{"clonerefs":"gcr.io/k8s-prow/clonerefs:v20210521-0713522bd8","initupload":"gcr.io/k8s-prow/initupload:v20210521-0713522bd8","entrypoint":"gcr.io/k8s-prow/entrypoint:v20210521-0713522bd8","sidecar":"gcr.io/k8s-prow/sidecar:v20210521-0713522bd8"},"gcs_configuration":{"bucket":"gs://prow-tidb-logs","path_strategy":"explicit"},"gcs_credentials_secret":"gcs-credentials"}},"options":{"retesting-branch":"rerere","retry":3,"require_contexts":{},"timeout":900000000000},"current_retry_times":1,"time":"2021-07-20T07:41:14.523614645Z"}
)" This reverts commit a168b92 Signed-off-by: hi-rustin <rustin.liu@gmail.com>
)" This reverts commit a168b92 Signed-off-by: hi-rustin <rustin.liu@gmail.com>
close #539