FilePersistence::MergeData Struct Reference

Public Member Functions
void	applyNonConflictingChanges ()

Public Attributes
ChangeGraph	cg_
QList< SoftConflict >	softConflicts_
std::shared_ptr< GenericTree >	treeA_
std::shared_ptr< GenericTree >	treeB_
std::shared_ptr< GenericTree >	treeBase_
std::shared_ptr< GenericTree >	treeMerged_

Member Function Documentation

applyNonConflictingChanges()

void FilePersistence::MergeData::applyNonConflictingChanges

(

)

Member Data Documentation

cg_

ChangeGraph FilePersistence::MergeData::cg_

softConflicts_

QList<SoftConflict> FilePersistence::MergeData::softConflicts_

treeA_

std::shared_ptr<GenericTree> FilePersistence::MergeData::treeA_

treeB_

std::shared_ptr<GenericTree> FilePersistence::MergeData::treeB_

treeBase_

std::shared_ptr<GenericTree> FilePersistence::MergeData::treeBase_

treeMerged_

std::shared_ptr<GenericTree> FilePersistence::MergeData::treeMerged_