git cherry-pick commit across linted code

Question

We recently linted out entire codebase. Yay! But now we're struggling to forward port patches across the linted commit. For example we have branches V1 and V2. V2 was created by linting V1 at some point in time. Now we want to cherry-pick a commit from V1 (orange) onto the head of V2. I'm struggling to get the commit to cherry-pick cleanly without a ton of conflicts. Any suggestions?

Edit: This is what I've tried

git checkout orange
Apply lint
git commit --amend --no-edit

At this point I have a orange' So far I've tried

git rebase HEAD~ --onto origin/V2
AND
git checkout origin/V2
git cherry-pick orange'

Answer 1

Got it to work

git checkout orange
Apply lint
git commit --amend --no-edit
git checkout origin/V2
git cherry-pick orange' -X theirs'