diff --git src/main/docbkx/developer.xml src/main/docbkx/developer.xml
index 3224834..9c6e244 100644
--- src/main/docbkx/developer.xml
+++ src/main/docbkx/developer.xml
@@ -2037,15 +2037,46 @@ justification="I know what I'm doing")
Include the Jira issue id in the commit message, along with a
short description of the change and the name of the contributor if
- it is not you. Be sure to get the issue id right, as this causes
+ it is not you. Be sure to get the issue ID right, as this causes
Jira to link to the change in Subversion (use the issue's
"All" tab to see these).
+ Commit the patch to a new branch based off master or other
+ intended patch. It's a good idea to call this branch by the JIRA ID.
+ Then check out the relevant target branch where you want to commit,
+ do a git pull command, cherry-pick the change
+ into each relevant branch (such as master), and do git push
+ <remote-server> <remote-branch>.
+
+ Commit a Change to Multiple Branches
+ This example shows how to apply a patch that was generated
+ with git diff --no-prefix origin/master and
+ apply it to the master and branch-1
+ branches. This is only one way to get to accomplish the
+ task and is not the only possible way.
+ $ git checkout -b HBASE-XXXX
+$ patch -p0 < ~/Downloads/HBASE-XXXX-v2.patch
+$ git commit -m "HBASE-XXXX Really Good Code Fix (Joe Schmo)" -a
+$ git checkout master
+$ git pull
+$ # Do the next two commands as quickly as possible to avoid conflicts
+$ git cherry-pick <sha-from-commit>
+$ git push origin master
+$ git checkout branch-1
+$ git pull
+$ # Do the next two commands as quickly as possible to avoid conflicts
+$ git cherry-pick <sha-from-commit>
+$ git push origin branch-1
+$ git branch -D HBASE-XXXX
+
+
+
Resolve the issue as fixed, thanking the contributor. Always set
the "Fix Version" at this point, but please only set a
- single fix version, the earliest release in which the change will
- appear.
+ single fix version for each branch where the change was committed,
+ the earliest release in that branch in which the change will appear.
+