Skip to content

Release 2.3.1 takes main by a merge before the release PR #256

Closed

Description

@CaffeinatedCoder

release/2.3.1 was cut from v2.3.0, and main has since opened 2.4.0 (#179: Version 2.4.0, a ## 2.4.0 — Unreleased section). The release PR into main conflicts on both, and the release workflow checks the tag against Version, so the merge commit that takes v2.3.1 must say 2.3.1.

Per decision 94, a release branch that falls behind main takes main by a merge. The merge keeps the release side of both files, so its tree is release/2.3.1's exactly. After the tag, CONTRIBUTING's step 5 opens 2.4.0 on main again, with the package-validation baseline at 2.3.1, and main is merged into release/2.4.0.

Activity

  1. added this to the 2.3.1 milestone on Oct 31, 2026
  2. added
    choreBuild, CI, tooling, packaging, refactoring with no behaviour change
    area/releaseVersioning, changelogs, packaging and release wiring
    on Oct 31, 2026
  3. CaffeinatedCoder commented on Oct 31, 2026

    @CaffeinatedCoder
    OwnerAuthor

    Done by #257, merged into release/2.3.1.

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

    area/releaseVersioning, changelogs, packaging and release wiringchoreBuild, CI, tooling, packaging, refactoring with no behaviour change

    Projects

    No projects

      Milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions