How to copy commit before merged other branch?

Question

I have done a commit ( 52c65fa ) with some changes that were to very linked to the branch. Then I have merged the master into the branch for solving conflicts ( 544c9d9 ) and then I have created a pull request. For approving the pull request, I need to remove that commit ( 52c65fa ). I have thought to do another branch and move it there, but cherry-pick is showing an error:

error: could not apply 52c65fa... 
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

The graph is like this:

  *   544c9d9 (origin/feat/error_hierarchy, feat/error_hierarchy) Resolved conflicts
 /|   
* |   cafe7d7 (origin/dev, dev) Merged in feat/follow_photo (pull request #10)
|\ \  
| * | 2032bff (origin/feat/follow_photo, feat/follow_photo) some other branch that have been merged
|/ /  
| * 52c65fa The commit that I want to copy
| * 82e24f5 other commits
|/  
*   e534410 (HEAD, feat/config_file_review) Merged in feat/logs_work (pull request #9)

Where is the HEAD I want to add the commit, How shall I do it?

Answer 1

我发现了问题：有冲突......我已经解决了它们并再次提交，现在这就是我想要的。