Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19475 Extended backporting strategy in documentation

This commit is contained in:
Jan Hentschel 2017-12-10 15:17:50 +01:00
parent 4c95b82b61
commit 1e88ccc70e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/asciidoc/_chapters/developer.adoc
View File

@ -2174,7 +2174,11 @@ If the contributor used +git format-patch+ to generate the patch, their commit m
[[committer.amending.author]] [[committer.amending.author]]
====== Add Amending-Author when a conflict cherrypick backporting ====== 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. When there is a minor conflict we can fix it up and just proceed with the commit.
The resulting commit retains the original author. 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 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