git MFC/cherry-pick question

Hi,

I am trying to MFC a commit to stable/12.
The cherry-pick works, but the resultant code
is not correct and won't build.
--> I broke the build yesterday and manually
       reverted the breakage.

So, how do I do this?

Do I have to manually edit the file after the
cherry-pick and then do something like a
git commit -a
to get the edited change in, or is there a
way to tell it to add it to the cherry-pick or ??

Thanks anyone, for help with this, rick