- Find the original commit with the given hash
- Mark the pull request as solving the same issues that was solved by the original commit
- Update the title to the first issue being solved
- Add the label "backport"
- Set the summary of the resulting commit of pull request to the summary of the original commit
- Append the correct
Backport-oftrailer to resulting commit when the pull request is integrated
If the commit did not apply cleanly then the commit must be backport manually and backport pull request must be created manually. See the CLI section for an example of how to do this using the command-line.
Use the Skara CLI tool git-backport to try to automatically create a backport pull request for the given commit, for example
git backport 5a526c1c5716f6d9a7fc94741bcdb2f424d342dfbackport https://github.com/openjdk/jdk 5a526c1c5716f6d9a7fc94741bcdb2f424d342df. If the commit applied cleanly onto the target repository then sponsor the resulting backport pull request with git-pr sponsor, for example
git pr sponsor 17.
If the commit could not be applied cleanly, then the conflicts must be manually resolved. After the conflicts have been resolved then a pull request must be created with the title "Backport <hash>". An example of how to do this is shown below:
$ git checkout -b backport-5a526c1c $ git fetch https://github.com/openjdk/jdk 5a526c1c5716f6d9a7fc94741bcdb2f424d342df $ git cherry-pick --no-commit FETCH_HEAD $ # resolve conflicts $ git commit -m 'Backport 5a526c1c5716f6d9a7fc94741bcdb2f424d342df' $ git push -u origin backport-5a526c1c
The output from the final
git push will return a link that can be used to create the pull request.