Skip to content

Merge main into v2/main so main-source.yml shares history and the v2.0.0 merge is clean #5171

Closed

Description

@cliffhall

The v2.0.0 merge PR (#5166) stopped being a pure merge after #5169. git merge-tree --write-tree origin/main origin/v2/main reports an add/add conflict in .github/workflows/main-source.yml:

Change

Merge origin/main into v2/main so the two branches share the file's history:

  1. Resolve the conflict to main's copy (node-version: 22).
  2. Re-apply fix: raise the TypeScript servers' Node floor to 24 #5169's node-version: 24 in a separate commit.

After that, v2/main contains every commit on main. The merge into main then produces v2/main's tree, and #5166 can be fast-forwarded to it.

The PR must be merged with "Create a merge commit". A squash or rebase would drop the shared history and bring the conflict back.

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

Metadata

Metadata

Assignees

Labels

choreMaintenance: deps, build tooling, CI, cleanup — no user-facing behavior changev2

Type

No type

Projects

No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions