This is an automated email from the ASF dual-hosted git repository.
comphead pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 3eebc95412 Minor: Add example of backporting / `cherry-pick`ing to
release branch (#13565)
3eebc95412 is described below
commit 3eebc95412d54f873d733490877ee6fbd3f2a25c
Author: Andrew Lamb <[email protected]>
AuthorDate: Thu Nov 28 15:24:15 2024 -0500
Minor: Add example of backporting / `cherry-pick`ing to release branch
(#13565)
* Minor: Add example of backporting to release branch
* prettier
---
dev/release/README.md | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/dev/release/README.md b/dev/release/README.md
index cac8ea654f..5dd9b4fc59 100644
--- a/dev/release/README.md
+++ b/dev/release/README.md
@@ -30,7 +30,7 @@ Patch releases are made on an adhoc basis, but we try and
avoid them given the f
- Once the PR is approved and merged, we tag the rc in the release branch, and
release from the release branch
- Bug fixes can be merged to the release branch and patch releases can be
created from the release branch
-#### How to add changes to `branch-*` branch?
+#### How to backport (add changes) to `branch-*` branch
If you would like to propose your change for inclusion in a release branch for
a
patch release:
@@ -39,6 +39,16 @@ patch release:
1. Follow normal workflow to create PR to `main` branch and wait for its
approval and merge.
1. After PR is squash merged to `main`, branch from most recent release branch
(e.g. `branch-37`), cherry-pick the commit and create a PR targeting the
release branch [example backport PR].
+For example, to backport commit `12345` from `main` to `branch-43`:
+
+```shell
+git checkout branch-43
+git checkout -b backport_to_43
+git cherry-pick 12345
+git push -u <your fork>
+# make a PR as normal
+```
+
[example release issue]: https://github.com/apache/datafusion/issues/9904
[example backport pr]: https://github.com/apache/datafusion/pull/10123
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
