From 56320f7bbaa1c51b353dd0cdf25a52eec1f47359 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Dec 17 2018 16:03:09 +0000 Subject: mention rebasing --- diff --git a/README.md b/README.md index cd11c12..45c0b01 100644 --- a/README.md +++ b/README.md @@ -215,6 +215,16 @@ it's accepted, apply your changes. If you have any questions about contributing or issues, please contact a member of the development team on IRC: #fedora-modularity on irc.freenode.net +### Rebase early, rebase often + +As a general rule, contributions aren't merged into the upstream branch but +applied on top ("rebased"). To make the reviewer's task easy and the review go +as smooth as possible, please rebase your branch on top of the upstream branch +it is based on (usually `master`) every now and then while you are developing +your contribution and also when you submit the pull request and while it is +reviewed. This ensures that your contribution applies cleanly always and is +very appreciated. Thanks! + ### Coding style For our Python code base, regarding coding style we largely follow [PEP