Browse Source

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

Agniva De Sarker 7 years ago
parent
commit
9a7a4503d6
1 changed files with 4 additions and 1 deletions
  1. 4 1
      contributing-guides/maintainers-guide.md

+ 4 - 1
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,