“Git Cherry Pick Resolve Conflict” Ответ

Git Cherry Pick Resolve Conflict

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

git cherry-pick --continue