From 7520c350e01b391790a81e82adcb22984692fbee Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Fri, 27 Sep 2019 13:34:03 -0700 Subject: [PATCH] Minor copy editing of first bullet item. --- work/flow.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/work/flow.rst b/work/flow.rst index b5da3ce7..b6f7ef68 100644 --- a/work/flow.rst +++ b/work/flow.rst @@ -488,7 +488,8 @@ We **always use non-fast forward merges** so that the merge point is marked in G We force push the rebased branch for three reasons: -1. In many repos, branch protection requires that Travis was run on any commits before they can be pushed onto master +1. In many repos, GitHub branch protection requires that Travis was run on any commits before they can be pushed onto master. + Branch protections also require that the branch is up-to-date with `master` before a merge is allowed. 2. The policy is to delete branches that have been merged. This is only possible if the exact commit has been merged. 3. For convenience, GitHub will automatically close pull requests if the corresponding branch has been merged to master.