kDB::Repository::VersionControl::DefaultMergeStrategy Class Reference

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

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

Classes
struct	Private

Additional Inherited Members
Public Member Functions inherited from kDB::Repository::VersionControl::AbstractMergeStrategy
void	addRevisions (const QList< Revision > &_revisions)
bool	merge ()
bool	hasChanges (qsizetype _index) const
QByteArray	diff (qsizetype _index) const
QByteArray	parentHash (qsizetype _index) const
bool	allHaveChanges () const
Protected Member Functions inherited from kDB::Repository::VersionControl::AbstractMergeStrategy
	AbstractMergeStrategy (Private *_d)
Protected Attributes inherited from kDB::Repository::VersionControl::AbstractMergeStrategy
Private *const	d

---

The documentation for this class was generated from the following files:

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