Have you ever had a #git cherry-pick that resulted in a conflict state but with no apparent issues? Most likely this means that the code base already contains the changes to be applied.

In this case it's best to re-check the branch you're trying to cherry-pick to.