Zulip Chat Archive
Stream: mathlib4
Topic: out-of-date pull request
Iván Renison (Nov 06 2023 at 13:30):
Hello, my pull request is out-of-date with the base branch but doesn't have merge conflicts, and is in awaiting-review, should I merge the changes of the base branch to my branch?
Eric Wieser (Nov 06 2023 at 13:33):
There's no need to unless there are merge conflicts, which there do not appear to be
Iván Renison (Nov 06 2023 at 13:39):
Ok, thanks
Iván Renison (Nov 06 2023 at 13:39):
How much time it's expected that I will have to wait until the pull request is reviewed?
Eric Rodriguez (Nov 06 2023 at 13:40):
We're currently in a bit of a crossroads because there's issues with the infrastructure caused by one of them just disappearing support-wise overnight
Mario Carneiro (Nov 06 2023 at 13:41):
that doesn't impact the review though
Eric Rodriguez (Nov 06 2023 at 13:41):
PR reviewing is very time consuming though even in normal times so I'd personally sit back and try not to stress about it
Eric Rodriguez (Nov 06 2023 at 13:41):
Mario Carneiro said:
that doesn't impact the review though
Are we still reviewing stuff? How are we merging?
Mario Carneiro (Nov 06 2023 at 13:42):
we aren't merging, but we are still reviewing
Mario Carneiro (Nov 06 2023 at 13:43):
some people are putting things like "bors r+" even though bors isn't listening, to register approval
Johan Commelin (Nov 06 2023 at 13:49):
maintainer merge
still works. I've been using that to create a log of mergeable PRs
Eric Wieser (Nov 06 2023 at 13:57):
I think the reason this question came up is that github is showing this new button after we reconfigured some settings:
Jireh Loreaux (Nov 06 2023 at 14:01):
bors r+
works insofar as the PR gets a "ready to merge" label though, right? Because that's just the GitHub bot.
Last updated: Dec 20 2023 at 11:08 UTC