Skip to content

Merge queue: switch mergeMethod SQUASH→MERGE atomically with disabling squash merges #37203

Description

@sfreudenthaler

Part of dotCMS/private-issues#673.

The merge queue on main is configured mergeMethod: SQUASH (MQ_kwDOADjo3c3YDw). When allow_squash_merge is disabled on this repo, the queue must switch to MERGE in the same change or enqueueing breaks. This item flips WITH the repo setting — last in the epic, after the other three land.

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

    Type

    Projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions