Feature/dusk styling#23
Merged
andrew-jon-p7a merged 4 commits intomainfrom Apr 28, 2026
Merged
Conversation
Signed-off-by: andrew-jon-p7a <andrewprzybilla@gmail.com>
# Conflicts: # pnpm-lock.yaml
andrew-jon-p7a
added a commit
that referenced
this pull request
Apr 29, 2026
Resolves textual conflicts in the import sort order of three files where my new enrollment-related imports landed adjacent to imports added by the SaaS pairing PR (#18) and dusk styling PR (#23): - apps/server/src/app.ts (3 conflict blocks, all kept-mine) - packages/sdk/src/client.ts (4 conflict blocks, all kept-mine) - apps/server/test/channels-endpoints.test.ts (3 blocks, kept-mine) All resolutions are pure "keep my additions" — origin/main has nothing in those positions, the conflicts were textual artifacts of git's auto-merge giving up on adjacent alphabetized sorts. Also pulled in the dependabot-merged @hono/node-server 2.0.0 bump (#22). Verified no breaking-change impact: the serve() factory pattern we use is stable across the major version. All 717 tests pass and biome is clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: andrew-jon-p7a <andrewprzybilla@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Large UI update