Skip to content

Commit 1e03176

Browse files
committed
Update README slightly
1 parent 7f99bd7 commit 1e03176

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

README.rdoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ This app is being developed using a rigorous behavior-driven approach, meaning t
162162

163163
At this point, development is happening on the following git branches. Additional temporary branches may be created and destroyed along the way, particularly if things get messy when adding new features or modifying architecture.
164164
==== not_passing
165-
This is the branch where new tests are written. The code stays here until all the tests pass\*.
166-
==== refactoring
167-
This is the branch where passing code gets refactored. Non-passing code should not be committed to +refactoring+.\* After each iteration, both the app and the tests should be refactored.
165+
This is the branch where new tests are written. The code stays here until all the tests pass\*. Refactoring also happens on this branch
166+
==== staging
167+
This is the branch where code gets pushed to verify it is passing before it gets pushed to +master+.
168168
==== master
169169
When code passes, it gets merged to +master+. Non-passing code should not be merged.\*
170170

0 commit comments

Comments
 (0)