Closed taki-jaro closed 6 years ago
@bors-servo r+
:pushpin: Commit 18ea0f8 has been approved by jdm
:umbrella: The latest upstream changes (presumably #393) made this pull request unmergeable. Please resolve the merge conflicts.
:lock: Merge conflict
Why this stiil isn't merged 2 hours after passing tests and approval?
I didn't think there was any particular rush, since there's still debugging happening for the test failures, right? I've been too hasty merging other PRs like the handle one while the Servo PR isn't ready yet.
No there is no particular rush.I was just surprised and thought there is a problem on my side.
@taki-jaro Could you rebase your commits against the master branch instead of merging? Once you've done that, you can instruct bors-servo to r=jdm.
@bors-servo delegate+
:v: @taki-jaro can now approve this pull request
@bors-servo r=jdm
:pushpin: Commit 3e5024a has been approved by jdm
:hourglass: Testing commit 3e5024a3bcb4dafb71a32bd652eb93d96a1bd67b with merge 22bc64807a0970f8ddc68bc039ac923bb5c2867f...
:broken_heart: Test failed - status-travis
@taki-jaro No need for a new commit; you can just @bors-servo retry
in order to re-trigger testing. Once you remove that commit, please @bors-servo r=jdm
again.
:pushpin: Commit 1bff572 has been approved by `jdm``
:hourglass: Testing commit 1bff572592c391ef96014c277551a74c1ef5cd37 with merge 96e1c30652a3aa42b21a3121c06d227f07af454e...
@bors-servo r-
:sunny: Test successful - status-appveyor, status-travis State: approved= try=False
@KiChjang Ok, thanks
@bors-servo retry
@bors-servo retry
@KiChjang It doesn't seem to work I still have failed test from 22 hours ago, the 2 retry command I gave didin't restart the test
@taki-jaro When you push a new commit, the r+ state in homu is reset, which forces you to do another r+. So if I do @bors-servo r=jdm right now, it would Just Work.
:pushpin: Commit 3e5024a has been approved by jdm
:bulb: This pull request was already approved, no need to approve it again.
:pushpin: Commit 3e5024a has been approved by KiChjang
:hourglass: Testing commit 3e5024a3bcb4dafb71a32bd652eb93d96a1bd67b with merge d027dbb85f587343c06a869d7fab8ae5981d535f...
:sunny: Test successful - status-appveyor, status-travis Approved by: KiChjang Pushing d027dbb85f587343c06a869d7fab8ae5981d535f to master...
It is needed for servo issue 15012.
This change is