AbstractMergeStrategy_p.h

#include "AbstractMergeStrategy.h"
 
#include "Revision.h"
 
#include <knowCore/Timestamp.h>
#include <QUuid>
 
#include <Cyqlops/Crypto/RSAAlgorithm.h>
 
namespace kDB::Repository::VersionControl
{
  struct AbstractMergeStrategy::Private
  {
    struct BranchInfo
    {
      QList<Revision> revisions;
      QByteArray diff;
      bool hasChanges;
    };
    QList<BranchInfo> branchInfos;
    bool allHaveChanges;
    
    virtual ~Private() {}
    virtual bool merge() = 0;
  };
}