user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typo in conventions.md

Browse source
This commit is contained in:
Phlosioneer 2018-03-06 20:01:09 -05:00 • committed by Who? Me?!
parent d58961b4c3
commit e34516461f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/doc/rustc-dev-guide/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
commit. This also makes rebases a lot less painful, since rustfmt
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
than those by bors. If you get a merge conflict, rebase instead via a