Skip to content

chore: back-merge server-v1.6.4 hotfix - #339

Closed
Codename-11 wants to merge 3 commits into
devfrom
main
Closed

Codename-11 wants to merge 3 commits into
devfrom
main

Conversation

@Codename-11

Copy link
Copy Markdown
Owner

Back-merges the immutable server-v1.6.4 production release into dev after the server-only hotfix. This reconciles release history without pulling unrelated dev work into the tag.

@Codename-11

Copy link
Copy Markdown
Owner Author

Replacing with an explicit no-ff reconciliation branch because main and dev contain the same server changes through different release histories.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant