[mattmatheson]

Mergequeues generally solve (1), but not for git merge conflicts. It's for when the combination of two in-flight changes would result in a regression (aka "logical merge conflict" https://trunk.io/blog/what-is-a-logical-merge-conflict)