Skip to content

next has fallen behind main (forward-merge drift) #3096

Description

@mittwald-machine

next is behind main by 1 commit(s), and the oldest un-merged commit is 132 minutes old — well past the 120 minute threshold. The superset invariant (ADR 0004 §1) is broken.

The likely cause is an EVICTED forward-merge run: GitHub keeps at most one pending run per concurrency group and cancels it when a newer run enters the group. A cancelled run is not a failure, so the escalation in ADR 0004 §10 does not fire.

Recovery — a manual forward-merge is a first-class path (ADR 0004 §2) and is idempotent, it merges the current tip of main:

gh workflow run forward-merge.yml --repo mittwald/flow --ref main

Close this issue once next contains main again; the next scheduled check will re-open it if it does not.

/cc @mfal @Lisa18289 @ins0 @maaaathis @Jan-Eimertenbrink

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

    automatedOpened by automation

    Type

    No type

    Projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions