dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mention `no merge policy` in the CONTRIBUTING guide

This commit is contained in:
stepnivlk 2019-03-16 14:51:59 +01:00
parent 52e885628e
commit a4b67ee195
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CONTRIBUTING.md
View File

@ -119,6 +119,13 @@ bring those changes into the source repository.
Please make pull requests against the `master` branch. Please make pull requests against the `master` branch.
Rust follows a no merge policy, meaning, when you encounter merge
conflicts you are expected to always rebase instead of merge.
E.g. always use rebase when bringing the latest changes from
the master branch to your feature branch.
Also, please make sure that fixup commits are squashed into other related
commits with meaningful commit messages.
Please make sure your pull request is in compliance with Rust's style Please make sure your pull request is in compliance with Rust's style
guidelines by running guidelines by running