Git: Advisory for cherry-picks to production branches
We often have a separate production branch that lags a bit behind the more cutting edge master branch. Sometimes you want to move some, but not all commits from master to production. This can be done with a
However, this may lead to considerable pain later, since git does not understand the commits are actually "the same". Hazards are unnecessary and hard to resolve conflicts as well as incorrect auto-merges.
In order to avoid this, always merge the production branch back to the master after the cherry-pick. Even though this will make the cherry-picked commits appear twice in
master, both branches will now have a common base again.
So the full workflow to move the AWESOME_COMMIT_SHA1 to production is:
git checkout production git cherry-pick AWESOME_COMMIT_SHA1 git checkout master git merge production