...
Use the Skara CLI tool git-backport to try to automatically create a backport pull request for the given commit, for example:
| Code Block |
|---|
git backport https://github.com/openjdk/jdk 5a526c1c5716f6d9a7fc94741bcdb2f424d342df |
...
If the commit applied cleanly onto the target repository then integrate the resulting backport pull request with git-pr integrate, for example:
| Code Block |
|---|
git pr integrate 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:
| Code Block |
|---|
$ 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 |
...
Overview
Content Tools
ThemeBuilder