Envision
A visual programming IDE for object-oriented languages
FilePersistence::Merge Member List

This is the complete list of members for FilePersistence::Merge, including all inherited members.

baseCommitId_FilePersistence::Mergeprivate
commit(const Signature &author, const Signature &committer, const QString &message)FilePersistence::Merge
GitRepository classFilePersistence::Mergefriend
hasConflicts() constFilePersistence::Merge
headCommitId_FilePersistence::Mergeprivate
initializePipelineComponents()FilePersistence::Mergeprivate
isAlreadyMerged() constFilePersistence::Mergeinline
isNodeInConflict(Model::NodeIdType nodeId) constFilePersistence::Merge
Kind enum nameFilePersistence::Merge
Merge(QString revision, bool fastForward, GitRepository *repository)FilePersistence::Mergeprivate
mergeData_FilePersistence::Mergeprivate
mergedTree()FilePersistence::Merge
mergePipeline_FilePersistence::Mergeprivate
performTrueMerge()FilePersistence::Mergeprivate
remainingChanges() constFilePersistence::Mergeinline
repository_FilePersistence::Mergeprivate
revisionCommitId_FilePersistence::Mergeprivate
RunMerge classFilePersistence::Mergefriend
softConflicts() constFilePersistence::Merge
Stage enum nameFilePersistence::Merge
stage_FilePersistence::Mergeprivate
Generated by doxygen 1.9.1