forked from ryyst/kalzu-value-store
ryyst
eaed6e76e4
The conflict resolution test was failing because when two nodes had the same timestamp but different UUIDs/data, the system would just keep local data instead of applying proper conflict resolution logic. ## 🔧 Fix Details - Implement "oldest-node rule" for timestamp collisions in 2-node clusters - When timestamps are equal, the node with the earliest joined_timestamp wins - Add fallback to UUID comparison if membership info is unavailable - Enhanced logging for conflict resolution debugging ## 🧪 Test Results - All integration tests now pass (8/8) - Conflict resolution test consistently converges to the same value - Maintains data consistency across cluster nodes This implements the sophisticated conflict resolution mentioned in the design docs using majority vote with oldest-node tie-breaking, correctly handling the 2-node cluster scenario used in integration tests. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>