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

Fix typo in conventions.md

This commit is contained in:
Phlosioneer 2018-03-06 20:01:09 -05:00 committed by Who? Me?!
parent bad6063311
commit c2560d523f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conventions.md
View File

@ -132,7 +132,7 @@ we do not currently run rustfmt all the time, that can introduce a lot
of noise into your commit. Please isolate that into its own of noise into your commit. Please isolate that into its own
commit. This also makes rebases a lot less painful, since rustfmt commit. This also makes rebases a lot less painful, since rustfmt
tends to cause a lot of merge conflicts, and having those isolated tends to cause a lot of merge conflicts, and having those isolated
into their own commit makes htem easier to resolve. into their own commit makes them easier to resolve.
**No merges.** We do not allow merge commits into our history, other **No merges.** We do not allow merge commits into our history, other
than those by bors. If you get a merge conflict, rebase instead via a than those by bors. If you get a merge conflict, rebase instead via a