how to resolve conflicts in git cherry-pick code example
Example: git cherry pick resolve conflict
// Resolve all conflits in VS Code git extension and then:
git cherry-pick --continue
// Resolve all conflits in VS Code git extension and then:
git cherry-pick --continue