From a25cd007413b4b01ee3ac75acc292398b8b0ae03 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Tue, 1 Dec 2015 23:14:50 +0100 Subject: [PATCH] State that we prefer rebasing over merging PRs --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eb43ae7b..96acc851 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,6 +32,10 @@ Also, make sure that your PRs do not contain unnecessary commits. If you think some of your commits should be merged into a single one, feel free to [squash them](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). +Please [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) outdated +PRs on master to help with the reviews (rebasing is preferred over merging to +keep a clean history in a branch/PR). + Additionally, give extra care to your commit messages, as they will help us review your PRs as well as help other contributors in the future, when exploring the history. The general rules are to [use the imperative present