Skip to content

Merge pro into main branch#485

Merged
brandonhs merged 1 commit into
mainfrom
feature/merge-pro-main
Mar 23, 2026
Merged

Merge pro into main branch#485
brandonhs merged 1 commit into
mainfrom
feature/merge-pro-main

Conversation

@brandonhs
Copy link
Copy Markdown
Member

Description

SVC Pro branch has since diverged heavily from main in the past month. This PR solves the majority of the divergent changes without including the SVC Pro specific features that should be separate from the all-system-compatible DWE OS standard.

Note: there might be a time soon in which the SVC Pro and main branch merge entirely, but that branch is not suited for usage on any system other than the SVC Pro at the moment.

@brandonhs
Copy link
Copy Markdown
Member Author

I do see that the schema has changed formatting and as a result shows a much larger diff than reality. This will be kept.

@brandonhs brandonhs merged commit 70b7f26 into main Mar 23, 2026
@brandonhs brandonhs deleted the feature/merge-pro-main branch March 23, 2026 21:29
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