force git to accept cherry-pick's changes

Question

I did cherry-pick from a gerrit review in my branch. In gerrit code review, I have two patch sets and I cherry-picked patch one before, so now I want to do the second patch

Answer 1

you could brute force it with something like this:

git show cb1e6a:path/to/filename > path/to/filename
git add path/to/filename
git commit

but I'm sure there's an easier way.