How does Rust avoid constant merge conflicts? E.g., I know there's an ongoing effort to split up
astconv.rs (#67418), yet people are still contributing to the file. On my own projects, I have multiple branches for different features and I relatively often get merge conflicts, or even worse, Git auto-merges and messes something up.
Are there special tricks that are used to ensure that changes merge smoothly?
Relative to its size, the code base changes relatively slowly, so conflicts aren't usually that much of a problem
Hmm. So you're saying that there aren't too many conflicting changes that are about to be merged at any one time? I guess rebasing is just the solution
Yeah, for PRs for splitting up astconv I'd expect some amount of conflicts. We don't have any special solution for that.
I will say that if you are doing a large refactor (e.g. touching a whole
rustc_* crate or multiple crates, you should expect to rebase a few times...