ctome
/
tldr
mirror of https://github.com/CrimsonTome/tldr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

maintainers-guide: cleanup msg when squashing

coverage
Waldir Pimenta 2018-01-28 23:15:50 +00:00 committed by Max Xu
parent a186436357
commit 7eb6873ba0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contributing-guides/maintainers-guide.md
View File

@ -84,9 +84,10 @@ as a guideline for current and future maintainers.
If there's a single commit in the PR,
or if the multiple commits are not semantically independent changes,
use the `Squash and merge` method.
If the PR author took the time to craft
(Don't forget to clean up the body of the squashed commit message.)
If instead the PR author took the time to craft
individual, informative messages for each commit,
use the `Rebase and merge` method,
then use the `Rebase and merge` method,
to honor that work and preserve the history of the changes.
For less clear-cut cases, a simple heuristic you can follow
is that if there are more "dirty" commits than "clean" commits,