Skip to content

Commit

Permalink
Auto merge of #6138 - giraffate:note_that_we_follow_rustc_no_merge_po…
Browse files Browse the repository at this point in the history
…licy, r=Manishearth

Add note that we follow a rustc no merge-commit policy

I think it would be better to add a note that we follow a rustc no merge-commit policy. For example, it was mentioned at #5694 (comment).

changelog: none
  • Loading branch information
bors committed Oct 8, 2020
2 parents 171ab9b + fd61686 commit 6bfc19c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions doc/basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Lints] or [Common Tools].
- [Setup](#setup)
- [Building and Testing](#building-and-testing)
- [`cargo dev`](#cargo-dev)
- [PR](#pr)

## Get the Code

Expand Down Expand Up @@ -110,3 +111,8 @@ cargo dev new_lint
# (experimental) Setup Clippy to work with rust-analyzer
cargo dev ra-setup
```

## PR

We follow a rustc no merge-commit policy.
See <https://rustc-dev-guide.rust-lang.org/contributing.html#opening-a-pr>.

0 comments on commit 6bfc19c

Please sign in to comment.