Automerge - a push to a branch, e.g. 10.11, should trigger a job to merge to the higher version branch e.g. 11.4, that should auto merge after passing CI.

There should be merge queue to be pushing to the target branch that handles resolving rebasing of commits.

There should be a code conflict resolution, and protected branch failure, to notify developers applicable to resolve this in a formed branch.

There was discussion if cherry-picks where going to make it easer to resolve bisects, however problems with attribution and tracking it was decided the current approach of merges should be used. serg has a bisect script to resolve bisects to keeping on the same branch which will be needed in the increase of merge commits.

Notifications to Slack channel was desired, both publicly and to the developer in question (name resolution compared to github?).

Brandon raised that merge conflicts can be known to developers who have a solution. Lets ensure they aren't pinged publicly when they have the ability to resolve this. As such Slack channel (but notot personal) pings can be delayed for a few hours to reduce the noise of understood problems.

Monty wants to trigger the merge on the command line, and to have some notification when its done.

Plan

• prototype and document github merge queues
• prototype autocreation of automerge pull requests
• prototype scripting of gh client tool to automerge and watch status of the progress of the automerge

Test cases

• commit to 10.11, observe merge up to all branches
• commit to 10.11, observe response of git conflict on later branch
• commit to 10.11, observe response of protect branch failure
• observe if a PR that of a merge can be rebased if it looses a race to a main branch