Archives:

how to cherry-pick a merge commit 5/5 (2)

Problem: For example: I have a merge in main dev branch, I want to cherry-pick that merge into a relatively old prod branch, If we directly do: git cherry-pick merge_commit_in_dev_branch, we will get a  error:  is a merge but no -m option was given. Solution So we need to do this: git cherry-pick -m 1  • Read More »