Skip to content

Commit 3561754

Browse files
committed
Add stipulation that changes must pass continuous integration tests
1 parent fca3506 commit 3561754

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docs/style-guides/git/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ This project follows the branching model articulated in ["A successful Git branc
149149

150150
* In order to merge a feature branch into the `develop` branch, submit a pull request against the `develop` branch.
151151

152-
* Before merging a feature branch into the `develop` branch, the source code __must__ be peer reviewed.
152+
* Before merging a feature branch into the `develop` branch, the source code __must__ be peer reviewed and pass continuous integration tests.
153153

154154

155155
### Releases
@@ -168,7 +168,7 @@ This project follows the branching model articulated in ["A successful Git branc
168168

169169
* Once a release branch is complete, submit a pull request against the `master` branch.
170170

171-
* Before merging the release branch into the `master` branch, the changes __must__ be peer reviewed.
171+
* Before merging the release branch into the `master` branch, the changes __must__ be peer reviewed and pass continuous integration tests.
172172

173173
* Once merged into `master`, submit a pull request against the `develop` branch to retain the changes made in the release branch.
174174

@@ -189,7 +189,7 @@ This project follows the branching model articulated in ["A successful Git branc
189189

190190
* Submit a pull request against the `master` branch.
191191

192-
* Before merging a hotfix branch into the `master` branch, the changes __must__ pass continuous integration tests and be peer reviewed.
192+
* Before merging a hotfix branch into the `master` branch, the changes __must__ be peer reviewed and pass continuous integration tests.
193193

194194
* Once merged into `master`, if a release branch currently exists, submit a pull request against the `release` branch. Otherwise, submit a pull request against the `develop` branch. By merging a hotfix into a release branch, the hotfix changes should be propagated to the `develop` branch upon merging the release branch into the `develop` branch.
195195

0 commit comments

Comments
 (0)