blob: d7c5c3f5bafdc49a671ca7de7b71ba1b743b9d2e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
package org.openecomp.sdc.conflicts;
import org.openecomp.conflicts.types.Conflict;
import org.openecomp.conflicts.types.ConflictResolution;
import org.openecomp.conflicts.types.ItemVersionConflict;
import org.openecomp.sdc.versioning.dao.types.Version;
public interface ConflictsManager {
boolean isConflicted(String itemId, Version version);
ItemVersionConflict getConflict(String itemId, Version version);
void finalizeMerge(String itemId, Version version);
Conflict getConflict(String itemId, Version version, String conflictId);
void resolveConflict(String itemId, Version version, String conflictId,
ConflictResolution resolution);
}
|