Skip to content

Commit

Permalink
Rollup merge of rust-lang#59234 - stepnivlk:add-no_merge_policy, r=ol…
Browse files Browse the repository at this point in the history 
…i-obk

Mention `no merge policy` in the CONTRIBUTING guide

Issue: rust-lang#59233
  • Loading branch information
@Centril
Centril committed Mar 31, 2019
2 parents c60e455 + a4b67ee commit 5cffe3a
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5cffe3a

Please sign in to comment.