Resolving Cherry-Pick Git Conflicts with Incoming Changes

It’s as easy as pie:¬†git cherry-pick --strategy=recursive -X theirs {hash}