mirror of
https://github.com/Xahau/xahaud.git
synced 2026-04-29 15:37:46 +00:00
After fetch/merge, if our entropy set hash didn't change, the conflicting peer had a subset of our data — not a real threat. Clear the conflict flag so we don't fall back to zero when a peer simply has fewer reveals than us. If the hash DID change (merge added data), re-count alignment with the updated hash before treating it as a real conflict. This prevents the majority from falling back to zero just because one peer (e.g. isolated) has a smaller reveal set.