remerg main with branch - #93
Merged
Merged
Conversation
- Extract computeClashPair() to eliminate duplicate pair logic in mergeDetectionResults - Return delta summary from mergeDetectionResults to avoid extra forEach in reducer - Unify SET_CLASHES and MERGE_CLASHES via fall-through (removes ~90% duplicate logic) - Reuse existing CHIP() helper for delta pills instead of inline styles - Extract EDITABLE_STATUSES constant (used in 2 places) - Cap auto_resolved clashes at 200 to prevent unbounded memory growth https://claude.ai/code/session_01EmeTMj76ufkDQbgcXgamzP
The pre-commit hook now analyzes the staged diff to determine bump level: - MAJOR: CDN/dependency changes, INIT state shape changes, removed public APIs - MINOR: new components/functions, new reducer cases, 150+ net new lines - PATCH: everything else (bug fixes, style tweaks, refactors) Override with BUMP=major|minor|patch environment variable. https://claude.ai/code/session_01EmeTMj76ufkDQbgcXgamzP
thomhoffer-arch
merged commit Mar 25, 2026
e76ce9b
into
claude/app-builder-dev-oJyps
5 checks passed
thomhoffer-arch
added a commit
that referenced
this pull request
Mar 25, 2026
Merge pull request #93 from thomhoffer-arch/main
This branch was previously deployed
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
2 participants
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.
No description provided.