4 Cherry picking commits from mainline to a branch

jim-p edited this page 2011-07-07 18:00:55 -07:00

Before you cherry-pick commits into a branch be sure you are only doing this for commits which actually belong on that branch, and not every commit. Typically a branch is for stable code at or near a release, so it tends to be non-intrusive bug fixes only. If you aren't sure, check with other devs before committing to a branch.

git fetch && git rebase origin (while you're still on master)

git checkout RELENG_2_0

git cherry-pick <commit id>

git push

git checkout master