Devs, Last week, I put some new PR rules in place, then removed them. They were, briefly: • all branches must be up to date with the target • Cassandane must pass The goal here was to make sure that we'd really run our tests, and that the branch was rebased, so we were keeping semilinear history. This did achieve the goal, but at too high a cost. Specifically, if you had four things to merge, you'd end up spending two hours on it, as each one needed to be rebased, tested, and then merged.
I believe we can maybe achieve what we want with a merge queue, but I haven't tested it yet. It's frustrating: GitHub doesn't make "rebase and then make a merge commit" easy in most places, but it's what we want. In the near future, I'll investigate whether we can at least use a merge queue to achieve that goal. You may see more changes to the branch protection rules as we sort that out. -- rjbs ------------------------------------------ Cyrus: Devel Permalink: https://cyrus.topicbox.com/groups/devel/T34743b452116dd10-Ma587e2a42a7fd602a9ef0ec9 Delivery options: https://cyrus.topicbox.com/groups/devel/subscription
