Example #1
0
  public MergeConflictsBuilder(SModel base, SModel mine, SModel repository) {
    // should be invoked from read action
    myBaseModel = base;
    myMyModel = mine;

    myRepositoryModel = repository;
    myMineChangeSet = ChangeSetBuilder.buildChangeSet(base, mine);
    myRepositoryChangeSet = ChangeSetBuilder.buildChangeSet(base, repository);

    collectConflicts();
  }