RepMembersConflictHandler implements ThreeWayConflictHandler { @NotNull @Override public Resolution addExistingProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, @NotNull PropertyState theirs) { if (isRepMembersProperty(theirs)) { mergeChange(parent, ours, theirs, ImmutableSet.of()); return Resolution.MERGED; } else { return Resolution.IGNORED; } }  @NotNull @Override Resolution addExistingProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState theirs); @Override @NotNull Resolution changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState base); @NotNull @Override Resolution changeChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState theirs, @NotNull PropertyState base); @NotNull @Override Resolution deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState base); @NotNull @Override Resolution deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState theirs,
            @NotNull PropertyState base); @NotNull @Override Resolution addExistingNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours,
            @NotNull NodeState theirs); @NotNull @Override Resolution changeDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours,
            @NotNull NodeState base); @NotNull @Override Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs,
            @NotNull NodeState base); @NotNull @Override Resolution deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState base);  }
@Test public void addExistingProperty() throws Exception { Root ours = login(getAdminCredentials()).getLatestRoot(); Root theirs = login(getAdminCredentials()).getLatestRoot(); add(ours, users[1].getID()); add(theirs, users[2].getID()); root.refresh(); assertTrue(group.isDeclaredMember(users[1])); assertTrue(group.isDeclaredMember(users[2])); }