git cherry pick resolve conflict

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

git cherry-pick --continue
Source

Also in C++: