From 1fb8b769c9e0cd20b946ee64558e8fdb12ff3e73 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sun, 10 Dec 2017 15:17:50 +0100 Subject: [PATCH] HBASE-19475 Extended backporting strategy in documentation --- src/main/asciidoc/_chapters/developer.adoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 637cdbc3ae..6d0a7d1a56 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -2201,7 +2201,11 @@ If the contributor used +git format-patch+ to generate the patch, their commit m [[committer.amending.author]] ====== Add Amending-Author when a conflict cherrypick backporting -We've established the practice of committing to master and then cherry picking back to branches whenever possible. +We've established the practice of committing to master and then cherry picking back to branches whenever possible, unless + +* it's breaking compat: In which case, if it can go in minor releases, backport to branch-1 and branch-2. +* it's a new feature: No for maintenance releases, For minor releases, discuss and arrive at consensus. + When there is a minor conflict we can fix it up and just proceed with the commit. The resulting commit retains the original author. When the amending author is different from the original committer, add notice of this at the end of the commit message as: `Amending-Author: Author -- 2.17.1