Skip to content

codeSplitter shadow mode: run our merge beside git's on real PRs, file every disagreement #1014

Closed

Description

@QuinnsCode

Follow-up to #938: catch our own merge mistakes.

Run codeSplitter's line-id merge next to git merge-tree on real PRs (this repo's merged PRs make a good corpus: base, head and main at merge time). Record every file where:

  • git conflicts and codeSplitter merges clean (check that the result builds and passes the tests),
  • codeSplitter conflicts and git merges clean (a resolver gap, like the ones measured in docs/merge-solutions.md),
  • the two clean results differ,
  • a guard trips (markers, unparseable data, lint).

Each disagreement becomes a fixture in test/conflicts.test.ts or a fix issue. Start as a script over local git history, with no live resources.

🤖 Generated with Claude Code

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

Metadata

Metadata

Assignees

Labels

No labels
No labels

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions