Skip to content

Commit

Permalink
Minor copy editing of first bullet item.
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathansick authored and timj committed Sep 27, 2019
1 parent f2681f3 commit d9aa2ed
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion work/flow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit d9aa2ed

Please sign in to comment.