Cherry-pick is indeed one way to move fixes from branch to another. The drawback with it however is that it always creates a completely new commit (the commit hash does not match the original one). This causes the history of the two branches to become incompatible, which makes it impossible to use some tools that git provide. However when using `git merge`, the commits are identical copies across branches.
Re: Moodle core development workflow by merging fixes with git
by Juho Jaakkola -
Number of replies: 0