When some commits in master branch are needed to be back-ported, you can do cherry-pick and send Pull-Request.
- Make sure the commits are already on master
Cherry-Pick with "-x"
$ git cherry-pick -x <COMMIT>
- Uncomment the conflics in commit message if there
- Send a Pull-Request to release branch
- Mark Add "Backport" label
commit 90ad8484773095459f81242ec1ed61822da7142b Author: Leif Hedstrom <firstname.lastname@example.org> Date: Fri Dec 9 08:08:31 2016 -0700 Update the RAT exceptions (cherry picked from commit 7487ff750cd214ee956557273c8059b9b3580983) Conflicts: ci/rat-regex.txt