Function tryToFinishMerge

plugins/vcs/Algorithm.h:165–209

}

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

    auto index = repository->getIndex();

    if (index->hasConflicts())
    {
        // Remove the conflict state from the map
        resolveMapFileConflictUsingOurs(repository);
        
        // If the index still has conflicts, notify the user
        if (index->hasConflicts())
        {
            wxutil::Messagebox::Show(_("Conflicts"),
                _("There are still unresolved conflicts in the repository.\nPlease use your Git client to resolve them and try again."),
                ::ui::IDialog::MessageType::MESSAGE_CONFIRM);
            return;
        }
    }

    auto head = repository->getHead();
    if (!head) throw git::GitException("Cannot resolve repository HEAD");

    auto upstream = head->getUpstream();
    if (!upstream) throw git::GitException("Cannot resolve upstream ref from HEAD");

    // We need the commit metadata to be valid
    git::CommitMetadata metadata;

    metadata.name = repository->getConfigValue("user.name");
    metadata.email = repository->getConfigValue("user.email");
    metadata.message = "Integrated remote changes from " + upstream->getShorthandName();

    if (metadata.name.empty() || metadata.email.empty())
    {
        metadata = ui::CommitDialog::RunDialog(metadata);
    }

    if (metadata.isValid())
    {
        repository->createCommit(metadata, upstream);
        repository->cleanupState();
    }
}

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