Git Cherry Pick Resolve Conflict
// Resolve all conflits in VS Code git extension and then:
git cherry-pick --continue
Fusinato
// Resolve all conflits in VS Code git extension and then:
git cherry-pick --continue