Skip to content

Commit d9aa2ed

Browse files
jonathansicktimj
authored andcommitted
Minor copy editing of first bullet item.
1 parent f2681f3 commit d9aa2ed

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

work/flow.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,8 @@ We **always use non-fast forward merges** so that the merge point is marked in G
488488
489489
We force push the rebased branch for three reasons:
490490

491-
1. In many repos, branch protection requires that Travis was run on any commits before they can be pushed onto master
491+
1. In many repos, GitHub branch protection requires that Travis was run on any commits before they can be pushed onto master.
492+
Branch protections also require that the branch is up-to-date with `master` before a merge is allowed.
492493
2. The policy is to delete branches that have been merged. This is only possible if the exact commit has been merged.
493494
3. For convenience, GitHub will automatically close pull requests if the corresponding branch has been merged to master.
494495

0 commit comments

Comments
 (0)