HBASE-19475 Extended backporting strategy in documentation
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5b24d4ce Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5b24d4ce Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5b24d4ce Branch: refs/heads/HBASE-20331 Commit: 5b24d4ce0cd3a24da4b0ff9e3dc80286b783b11b Parents: 1b98a96 Author: Jan Hentschel <[email protected]> Authored: Sun Dec 10 15:17:50 2017 +0100 Committer: Jan Hentschel <[email protected]> Committed: Sat Jun 2 10:36:01 2018 +0200 ---------------------------------------------------------------------- src/main/asciidoc/_chapters/developer.adoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5b24d4ce/src/main/asciidoc/_chapters/developer.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 637cdbc..6d0a7d1 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
