mattmatheson·10 месяцев назад·discussHow did you guys resolve merge or test conflicts? Did you just have to rebase, update your PR, and resubmit?
mattmatheson·10 месяцев назад·discussMergequeues 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)