kDB::Repository::VersionControl::DefaultMergeStrategy::Private Struct Reference

Inheritance diagram for kDB::Repository::VersionControl::DefaultMergeStrategy::Private:

Collaboration diagram for kDB::Repository::VersionControl::DefaultMergeStrategy::Private:

Public Member Functions
bool	merge () override
QByteArray	delta (qsizetype _index, const QList< TriplesToStatus > &_statutes)
Public Member Functions inherited from kDB::Repository::VersionControl::AbstractMergeStrategy::Private

Additional Inherited Members
Public Attributes inherited from kDB::Repository::VersionControl::AbstractMergeStrategy::Private
QList< BranchInfo >	branchInfos
bool	allHaveChanges

Member Function Documentation

delta()

QByteArray kDB::Repository::VersionControl::DefaultMergeStrategy::Private::delta ( qsizetype _index, const QList< TriplesToStatus > & _statutes )

inline

Compute the merge of other branches into the branch referenced by _index

merge()

bool kDB::Repository::VersionControl::DefaultMergeStrategy::Private::merge ( )

overridevirtual

Implements kDB::Repository::VersionControl::AbstractMergeStrategy::Private.

---

The documentation for this struct was generated from the following file:

• kdb/kDB/Repository/VersionControl/DefaultMergeStrategy.cpp