From 9a7a4503d694652b1dd07c7cee4e7ee1f780ec88 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Sat, 13 Jan 2018 12:29:33 +0530 Subject: [PATCH] maintainers-guide.md: Suggest to use rebase rather than merge (#1887) --- contributing-guides/maintainers-guide.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contributing-guides/maintainers-guide.md b/contributing-guides/maintainers-guide.md index 8383233369..dd033ea724 100644 --- a/contributing-guides/maintainers-guide.md +++ b/contributing-guides/maintainers-guide.md @@ -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,