- $ git checkout master
- $ ./pick.py -V 2.4.9
-
-The script creates a new branch 'auto-merged-2.4.9' which is based on the
-current support branch. It then merges all commits from the 'master' branch which
-reference a ticket for the version that was specified.
-
-If there are any merge commits you will need to manually fix them and continue the
-rebase until no commits are left:
-
- $ git rebase --continue
-
-After finishing the rebase the branch needs to be merged into the support branch:
-
- $ git checkout support/2.4
- $ git merge --ff-only auto-merged-2.4.9
+For minor versions you need to manually backports any and all commits from the
+master branch which should be part of this release.