Skip to content

Commit

Permalink
Mention no merge policy in the CONTRIBUTING guide
Browse files Browse the repository at this point in the history
  • Loading branch information
stepnivlk committed Mar 16, 2019
1 parent 52e8856 commit a4b67ee
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 @@ -119,6 +119,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 a4b67ee

Please sign in to comment.