Function resolveMapFileConflictUsingOurs

plugins/vcs/Algorithm.h:144–163

}

inline void resolveMapFileConflictUsingOurs(const std::shared_ptr<Repository>& repository)
{
    auto mapPath = repository->getRepositoryRelativePath(GlobalMapModule().getMapName());
    auto index = repository->getIndex();

    // Remove the conflict state of the map file after save
    if (!mapPath.empty() && index->fileIsConflicted(mapPath))
    {
        index->resolveByUsingOurs(mapPath);

        auto infoFilePath = getInfoFilePath(mapPath);

        if (!infoFilePath.empty())
        {
            index->resolveByUsingOurs(infoFilePath);
        }

        index->write();
    }
}

inline void tryToFinishMerge(const std::shared_ptr<Repository>& repository)
{