[midPoint-git] [Evolveum/midpoint] 1f5def: computing conflicts in tree delta

[Viliam Repan]

  Branch: refs/heads/feature/tree-delta
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1f5def001fa56f98016852e87f5a661cd236adf1
      https://github.com/Evolveum/midpoint/commit/1f5def001fa56f98016852e87f5a661cd236adf1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-05-10 (Fri, 10 May 2024)

  Changed paths:
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/Conflict.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ContainerTreeDeltaValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ItemTreeDeltaValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/item/ObjectTreeDelta.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/ThreeWayMergeTest.java

  Log Message:
  -----------
  computing conflicts in tree delta



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications