... | ... | @@ -144,7 +144,7 @@ After a patch has made it to `master` it might be appropriate to backport it to |
|
|
While the release manager can perform the backport on your behalf, it is appreciated if you open a merge request with the backported patches yourself. There are two ways to backport a merge request:
|
|
|
|
|
|
* Via the web interface using the "Cherry-pick" button on the merged MR. While convenient, this is only possible if there are no merge conflicts with the stable branch. Be sure to **select the correct target branch**.
|
|
|
* Via the command-line using the `git cherry-pick` command. In this case select the appropriate "backport" template (e.g. `backport-for-ghc-8.8`) when creating your merge request.
|
|
|
* Via the command-line using the `git cherry-pick` command. In this case select the appropriate "backport" template (e.g. `backport-for-ghc-9.8`) when creating your merge request.
|
|
|
|
|
|
After the merge request is created ensure it has the ~backport label applied and that its milestone is set appropriately.
|
|
|
|
... | ... | |