diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-03-31 16:10:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 16:10:36 +0200 |
| commit | df18e190be00cb16f13b0f49207be2ba95240455 (patch) | |
| tree | 2c1e04357e3f5a628d23d65f7f10630d057b8710 /CONTRIBUTING.md | |
| parent | a02b825c9330f9abe5813d2fd5e65d361ff218ea (diff) | |
| parent | a4b67ee1952367403290392db428d2eb499454d1 (diff) | |
| download | rust-df18e190be00cb16f13b0f49207be2ba95240455.tar.gz rust-df18e190be00cb16f13b0f49207be2ba95240455.zip | |
Rollup merge of #59234 - stepnivlk:add-no_merge_policy, r=oli-obk
Mention `no merge policy` in the CONTRIBUTING guide Issue: https://github.com/rust-lang/rust/issues/59233
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fa408935cc8..db37fa0caf6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -122,6 +122,13 @@ bring those changes into the source repository. 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 guidelines by running |