Skip to content

MSC4297: State Resolution 2.1#4297

Merged
turt2live merged 2 commits intomainfrom
kegan/msc4297
Aug 14, 2025
Merged

MSC4297: State Resolution 2.1#4297
turt2live merged 2 commits intomainfrom
kegan/msc4297

Conversation

@kegsay
Copy link
Copy Markdown
Member

@kegsay kegsay commented Jun 6, 2025 •
edited by ara4n
Loading

Rendered

(Written by Kegan as Element staff eng)

@turt2live turt2live marked this pull request as draft June 6, 2025 22:49
@turt2live
Copy link
Copy Markdown
Member

turt2live commented Jun 6, 2025

Labeling in accordance with matrix-org/matrix-spec#2157

@turt2live turt2live added proposal A matrix spec change proposal needs-implementation This MSC does not have a qualifying implementation for the SCT to review. The MSC cannot enter FCP. labels Jun 6, 2025
@turt2live turt2live added proposal-placeholder This label is removed and replaced with `proposal` once the placeholder status is cleared. action-required Just a bright label to differentiate arbitrary proposals. and removed proposal A matrix spec change proposal labels Jul 3, 2025
@github-project-automation github-project-automation bot moved this to Tracking for review in Spec Core Team Workflow Jul 8, 2025
@turt2live turt2live moved this from Tracking for review to Ready for general review in Spec Core Team Workflow Jul 8, 2025
@turt2live turt2live moved this from Ready for general review to In FCP in Spec Core Team Workflow Jul 17, 2025
@turt2live turt2live moved this from In FCP to Requires spec writing in Spec Core Team Workflow Jul 22, 2025
@turt2live turt2live moved this from Requires spec writing to Requires spec PR review in Spec Core Team Workflow Jul 28, 2025
@turt2live turt2live self-assigned this Aug 14, 2025
@turt2live
Add MSC4297: SR2.1 manually
0c3e612 
`git apply` hates me
@turt2live turt2live added proposal A matrix spec change proposal and removed needs-implementation This MSC does not have a qualifying implementation for the SCT to review. The MSC cannot enter FCP. proposal-placeholder This label is removed and replaced with `proposal` once the placeholder status is cleared. action-required Just a bright label to differentiate arbitrary proposals. labels Aug 14, 2025
@turt2live turt2live changed the title [WIP] Placeholder MSC4297: State Resolution 2.1 Aug 14, 2025
@turt2live turt2live marked this pull request as ready for review August 14, 2025 17:09
@turt2live
Copy link
Copy Markdown
Member

turt2live commented Aug 14, 2025

This MSC was put through FCP out of band.

@turt2live turt2live added requires-room-version An idea which will require a bump in room version merged A proposal whose PR has merged into the spec! kind:core MSC which is critical to the protocol's success s2s Server-to-Server API (federation) room-spec Something to do with the room version specifications and removed finished-final-comment-period labels Aug 14, 2025
@turt2live turt2live merged commit d9ec338 into main Aug 14, 2025
1 check passed
@turt2live turt2live moved this from Requires spec PR review to Merged in Spec Core Team Workflow Aug 14, 2025
@turt2live
Copy link
Copy Markdown
Member

turt2live commented Aug 14, 2025

Merged 🎉

@zecakeh zecakeh mentioned this pull request Sep 12, 2025
Closed
31 tasks
This was referenced Jan 29, 2026
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@turt2live turt2live

Labels

kind:core MSC which is critical to the protocol's success merged A proposal whose PR has merged into the spec! proposal A matrix spec change proposal requires-room-version An idea which will require a bump in room version room-spec Something to do with the room version specifications s2s Server-to-Server API (federation)

Projects

Spec Core Team Workflow
Status: Merged/Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kegsay @turt2live