You are viewing an old version of this page. View the current version.

Compare with Current View Page History

Version 1 Next »

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

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

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

Impacts on current workflow

  • once the merge queue is enabled, it's a requirement - so all PRs will be merged via the queue.
  • "squash merge commits" is done automatically - so if you want to edit the commit message, you'll need to do this locally on your branch prior to adding it to the merge queue - eg https://stackoverflow.com/questions/25356810/git-how-to-squash-all-commits-on-branch
  • avoiding unnecessary merge conflicts - think about inserting into a sensible place in the changelog, rather than appending to the end by default


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

  • No labels