git cherry pick take all conflicts from ours code example

Example: git cherry pick resolve conflict

// Resolve all conflits in VS Code git extension and then:

git cherry-pick --continue