使用git cherry-pick 解决冲突，commit changes to other branch and resolve conflict

Check out the branch you want to cherry-pick from Harley bugfix branches have been added to the main Koha git repo, so you don't have to add a new remote repo. There we can find a branch for Bug 3475.

>>阅读原文<<