mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 12:52:24 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Room version 12 (#3623)
Some checks are pending
Dendrite / Sytest (SQLite Cgo) (push) Blocked by required conditions
Details
Dendrite / WASM build test (push) Waiting to run
Details
Dendrite / Linting (push) Waiting to run
Details
Dendrite / Unit tests (push) Waiting to run
Details
Dendrite / Build for Linux (push) Waiting to run
Details
Dendrite / Build for Windows (push) Waiting to run
Details
Dendrite / Initial tests passed (push) Blocked by required conditions
Details
Dendrite / Integration tests (push) Blocked by required conditions
Details
Dendrite / Upgrade tests (push) Blocked by required conditions
Details
Dendrite / Upgrade tests from HEAD-2 (push) Blocked by required conditions
Details
Dendrite / Sytest (PostgreSQL) (push) Blocked by required conditions
Details
Dendrite / Sytest (SQLite native) (push) Blocked by required conditions
Details
Dendrite / Complement (PostgreSQL) (push) Blocked by required conditions
Details
Dendrite / Complement (SQLite native) (push) Blocked by required conditions
Details
Dendrite / Complement (SQLite Cgo) (push) Blocked by required conditions
Details
Dendrite / Integration tests passed (push) Blocked by required conditions
Details
Dendrite / Update Docker images (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
Kegan Dougal 2025-08-11 20:59:47 +01:00 • committed by GitHub
parent a408b24d28
commit 4d93d921be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 530 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roomserver/state/state.go
View file

@ -888,6 +888,8 @@ func (v *StateResolution) resolveConflicts(
case gomatrixserverlib.StateResV1:
return v.resolveConflictsV1(ctx, notConflicted, conflicted)
case gomatrixserverlib.StateResV2:
fallthrough
case gomatrixserverlib.StateResV2_1:
return v.resolveConflictsV2(ctx, notConflicted, conflicted)
}
return nil, fmt.Errorf("unsupported state resolution algorithm %v", stateResAlgo)