Skip to content

codeSplitter merge: fm-daw Full.tsx comes out clean as a mix of one side's layout and the other's split cards (#2654) #4138

Open

Description

@QuinnsCode

Split out of #4133, from the same shadow-check merge: PR #2654's merge 17cdbb0 (fm-daw).

What happened. apps/fm-daw/src/ui/Full.tsx: git conflicts on it, and codeSplitter calls it clean, but mixes the branch's single-component layout with main's split cards. It ends up 11 lines off what landed. (#4133 fixed net.ts in the same merge: its new status calls now get both sides' fields.)

Repro. cd apps/codesplitter && bun scripts/shadow.ts --pr 2654 --json (needs git fetch origin refs/pull/2654/head); the Full.tsx row is git-only, off: 11. For a unit case, shadow() on Full.tsx at the merge-base of 17cdbb0^1 and 17cdbb0^2, 17cdbb0^2 (main) and 17cdbb0^1 (branch).

What should happen. When one side restructured a component and the other split it, that's a card, not a clean mix. Or the merge comes out as what landed. Whether this one broke tests on its own isn't known: the two fm-daw failures came from net.ts.

Part of #1141.

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions