GitHub Merge Queue

Update - disabled ~ Mar 17 2023

Issues found


Update - enabled on Mar 13 2023. DCO required adjusting as per https://github.com/hyperledger/besu/pull/5207

Essentially this works the same as enabling auto-merge, except that any additional "merge from main" actions are automated.

Impacts on current workflow

  • once the merge queue is enabled, it's a requirement - so all PRs will be merged via the queue.
  • to add your PR to the merge queue, you need to click the green "merge when ready" button" just as you would click the "enable auto-merge" button
  • "squash merge commits" is done automatically
  • avoiding unnecessary merge conflicts - think about inserting into a sensible place in the changelog, rather than appending to the end by default
  • when there's a merge conflict, the PR with the conflicts gets kicked out of the merge queue and manual intervention is required - same as if you had enabled "auto-merge"

Discussion in Feb 28 contributor call on enabling the merge queue 2023-02-28 Contributor Call - APAC Friendly Time after 23.1.1 release

Note - it's part of "branch protection" - so you turn it on for specific branch protection rules.

This feature is still in beta - discussion https://github.blog/changelog/2023-02-08-pull-request-merge-queue-public-beta/

Link to Besu merge queue (when enabled) would be https://github.com/hyperledger/besu/queue/main