Sorted:

Tag: Conflict resolution

Maven Dependency Conflict Resolution

Hibernate Primary Key Conflict Solutions

Cassandra Concurrent Write Conflict Resolution

Brainstorm Framework: Team Conflict Resolution