Skip to content

Commit 3eebc95

Browse files
authored
Minor: Add example of backporting / cherry-picking to release branch (#13565)
* Minor: Add example of backporting to release branch * prettier
1 parent 2b37018 commit 3eebc95

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

dev/release/README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Patch releases are made on an adhoc basis, but we try and avoid them given the f
3030
- Once the PR is approved and merged, we tag the rc in the release branch, and release from the release branch
3131
- Bug fixes can be merged to the release branch and patch releases can be created from the release branch
3232

33-
#### How to add changes to `branch-*` branch?
33+
#### How to backport (add changes) to `branch-*` branch
3434

3535
If you would like to propose your change for inclusion in a release branch for a
3636
patch release:
@@ -39,6 +39,16 @@ patch release:
3939
1. Follow normal workflow to create PR to `main` branch and wait for its approval and merge.
4040
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].
4141

42+
For example, to backport commit `12345` from `main` to `branch-43`:
43+
44+
```shell
45+
git checkout branch-43
46+
git checkout -b backport_to_43
47+
git cherry-pick 12345
48+
git push -u <your fork>
49+
# make a PR as normal
50+
```
51+
4252
[example release issue]: https://github.com/apache/datafusion/issues/9904
4353
[example backport pr]: https://github.com/apache/datafusion/pull/10123
4454

0 commit comments

Comments
 (0)