Method resolveByUsingOurs

plugins/vcs/Index.cpp:69–73

}

void Index::resolveByUsingOurs(const std::string& relativePath)
{
    auto error = git_index_add_bypath(_index, relativePath.c_str());
    GitException::ThrowOnError(error);
}

bool Index::fileIsConflicted(const std::string& relativePath)
{