Type Alias ConflictResolution

ConflictResolution: "accept" | "reject" | "merge"

The resolution a user picks for a conflict: keep the accepted (winning) side, take the rejected (losing) side, or merge (combine) both sides.