How to Conclude a Git Cherry-Pick?

Question

Yesterday I cherry-picked two commits into my main branch, one of them caused merge conflicts and I resolved them, committed and pushed them to origin. Today I am attempting

Answer 1

Next time try git cherry-pick --abort, otherwise what you did should more or less work.