Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-08 17:03:42 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Brief mention of state conflict resolution

Browse source
This commit is contained in:
Erik Johnston 2015-01-14 14:48:43 +00:00
parent f09e5a676f
commit 232e2675dd
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drafts/erikj_federation.rst
View file

@ -284,6 +284,14 @@ pick the one with the greatest:
#. Hash of event_id.
State Conflict Resolution
-------------------------
If a server discovers that it disagrees with another about the current state,
it can follow the same process outlined in *Auth chain resolution* to resolve
these conflicts.
Appendix
========