maintainers-guide.md: Suggest to use rebase rather than merge (#1887)

This commit is contained in:
Agniva De Sarker 2018-01-13 12:29:33 +05:30 committed by GitHub
parent 92f1203442
commit 9a7a4503d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,7 +25,10 @@ for the behavior expected of tldr-pages maintainers:
or if the multiple commits are not independent changes.
If the PR author took the time to craft individual,
informative commit messages for each commit,
use regular merge to honor that work and preserve the history of the changes.
use rebase to honor that work and preserve the history of the changes.
A simple heuristic to follow is that if there are more "dirty" commits
than "clean" commits, then prefer squash, else do a rebase.
- **Know when and how to say no**.
Sometimes requests or contributions need to be declined,