@@ -48,8 +48,7 @@ With GitFlow and OneFlow, in order to get the benefit of
48
48
https://martinfowler.com/articles/continuousIntegration.html[Continuous Integration], you have to either test each topic
49
49
branch in isolation, OR you have to merge it to the main line. Testing the topic in isolation, well, tests in isolation,
50
50
which is "continuous", but isn't "integration". Waiting to merge until the topic is "done" means you can only test it
51
- along with other work that is also "done". This is "integration", but it isn't "continuous". So neither approach gets
52
- us continuous integration.
51
+ along with other work that is also "done". This is "integration", but it isn't "continuous".
53
52
54
53
This tension exists between "continuous" and "integration" because in most non-trivial projects, topics don't have a
55
54
binary done/not done state: they are almost always a work in progress, with their stability being an analog continuum,
@@ -70,8 +69,8 @@ Gitworkflow allows the alpha and beta-quality integration branches to be rewound
70
69
topics to be massaged via interactive rebase until they form a series of easily understandable and reviewable chunks of
71
70
work. With other flows, this is only an option until the topic is considered "done" and is merged to the main line for
72
71
CI and user testing. Gitworkflow removes the limitation that a topic branch cannot be interactively rebased after it has
73
- been merged for CI and user testing, and generally for alpha-quality topics, this would be expected rather than frowned
74
- on.
72
+ been merged for CI and user testing, and especially for alpha-quality topics, this would be expected by most team leads
73
+ and code reviewers, rather than frowned on.
75
74
76
75
=== Flexibility
77
76
@@ -125,9 +124,9 @@ understand. This means that:
125
124
126
125
=== Documentation
127
126
128
- * See the link:./docs/concepts-summary.adoc[Concepts Summary]
129
- * See the link:./docs/task-oriented-primer.adoc[Task-Oriented Primer]
130
- * See the link:./docs/useful-commands.adoc[Useful Commands]
127
+ * link:./docs/concepts-summary.adoc[Concepts Summary]
128
+ * link:./docs/task-oriented-primer.adoc[Task-Oriented Primer]
129
+ * link:./docs/useful-commands.adoc[Useful Commands]
131
130
132
131
=== Questions?
133
132
0 commit comments