fix: Revert "feat: add label in case of conflict (#652)" #654
Conversation
)" This reverts commit a168b92 Signed-off-by: hi-rustin <[email protected]>
ti-chi-bot
added
the
dco-signoff: yes
ti-chi-bot
added
the
size/XS
|
🎊 PR Preview 74df7e1 has been successfully built and deployed to https://ti-community-infra-tichi-preview-pr-654.surge.sh 🕐 Build time: 0.015s
🤖 By surge-preview |
Codecov Report
@@ Coverage Diff @@
## master #654 +/- ##
==========================================
+ Coverage 80.25% 80.35% +0.09%
==========================================
Files 17 17
Lines 2345 2341 -4
==========================================
- Hits 1882 1881 -1
+ Misses 306 304 -2
+ Partials 157 156 -1
Continue to review full report at Codecov.
|
|
[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 |
|
This pull request has been accepted and is ready to merge. Commit hash: 74df7e1
|
ti-chi-bot
added
the
status/can-merge
|
what happened 😂 |
{"job":{"type":"presubmit","job":"pull-tichi-rerere","buildid":"1417714322494197760","prowjobid":"62857e4c-e9e2-11eb-a1a1-560b2b06a47e","refs":{"org":"ti-community-infra","repo":"tichi","repo_link":"https://github.com/ti-community-infra/tichi","base_ref":"master","base_sha":"6e5814c24e5c71c9e99ce152b0a3a4fcc40acfa9","base_link":"https://github.com/ti-community-infra/tichi/commit/6e5814c24e5c71c9e99ce152b0a3a4fcc40acfa9","pulls":[{"number":654,"author":"hi-rustin","sha":"74df7e1947d03cd15764fd2a405fe4e367f45e44","link":"https://github.com/ti-community-infra/tichi/pull/654","commit_link":"https://github.com/ti-community-infra/tichi/pull/654/commits/74df7e1947d03cd15764fd2a405fe4e367f45e44","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-21T05:16:35.056350818Z"}
See: #539 (comment) |
This reverts commit a168b92
Signed-off-by: hi-rustin [email protected]