From df32f331eb56392c55e4d8aa59f8914399885496 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 28 Jul 2009 11:20:46 +0200 Subject: rules/source_repositories: Say why merging is good. --- rules/source_repositories.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rules/source_repositories.mdwn b/rules/source_repositories.mdwn index 1f228f7e..0d2911b2 100644 --- a/rules/source_repositories.mdwn +++ b/rules/source_repositories.mdwn @@ -84,6 +84,10 @@ happen, the copyright of your changes has to be assigned to the Free Software Foundation; read about the [[copyright_assignment_process|savannah_group#copyright_assignment]]. +It is explicitly encouraged to *merge* changes from working branches into the +mainline branches (as opposed to *rebase* them on top), as the former mode +easily allows to determine the context under which a patch has been developed. + # Tags Equivalent rules apply. -- cgit v1.2.3