Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Does not always detect conflicts #88

Open
RalfJung opened this issue May 11, 2020 · 2 comments
Open

Does not always detect conflicts #88

RalfJung opened this issue May 11, 2020 · 2 comments

Comments

@RalfJung
Copy link
Member

RalfJung commented May 11, 2020 •
edited
Loading

Recently I had several cases where a PR started having conflicts with master, but homu failed to report that. Most recently, this happened in rust-lang/rust#71946.

This used to work more reliably, and it is quite useful as otherwise I as PR author have no idea that a rebase is needed.
@RalfJung
Copy link
Member Author

RalfJung commented May 28, 2020 •
edited
Loading

rust-lang/miri#1422 is another case where there was no warning about a conflict.

EDIT: but also, rebase was clean, so I don't know why GitHub said there was a conflict.

@RalfJung RalfJung mentioned this issue Oct 17, 2020
Closed
@camelid
Copy link
Member

camelid commented Oct 18, 2020

Another case of this from rust-lang/rust#78007:

Bors did not report a merge conflict

#77981 has made three very small changes, one of those made #77187 unmergable. Previously, bors reported, if a pull request got unmergable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@RalfJung @camelid