Spurious merge conflict error
Open
Nobody has claimed this yet.
- Dominant language
- Rust
- Stars
- 176
- Forks
- 65
- Avg merge
- 1d 3h
- Merged PRs (30d)
- 13
Description
See https://github.com/rust-lang/rust/pull/161149#issuecomment-5672650766
I suspect this is because I kicked off a second try build in very short succession after the first one, but not sure. Maybe GitHub was just having a bad day?
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start with the linked Rust pull request comment and trace the bors try-build and merge-conflict handling involved in the report. Reproduce the rapid successive try-build scenario if possible; done means identifying whether the error is spurious and adding a regression test or a clearly justified fix.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- rust
- Domain
- ci-cd
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Active
- Clarity
- Needs clarification
- Newbie friendliness
- 35/100