rust-lang / rust-lang/rustc-perf
rolled up builds: conflicts merging 'xxx' into previous master
Open
Nobody has claimed this yet.
- Dominant language
- Rust
- Stars
- 733
- Forks
- 189
- Avg merge
- 10h 52m
- Merged PRs (30d)
- 43
Description
https://github.com/rust-lang/rust/pull/136658#issuecomment-2642051592
Rolled up build for rollup reports troubles, didn't saw that much before. Maybe affected by including subtree with merge commits into rollup?
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-lang/rust pull request comment and investigate the rolled-up build report for conflicts when merging into the previous master. Reproduce the reported conflict and determine whether subtree merge commits are involved; done means the cause is identified and rolled-up builds handle the affected history correctly.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- rust
- Domain
- build-system
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100