S
smat-consulting
Guest
theoretically QA has to test E-111 separately and E-123 separately, too - both in their own branch. Then, when it is decided which goes and which stays, all those that go are merged into a new Release-Branch, and the whole system tested. During the merge into this Release-Branch, the merging of E111 and E-123 changes happen; that is, the program that was changed for E111 and E123 gets both changes applied. At this time, both Pete and John would need to agree that the merge is ok, and only then can QA start testing. Once the Release-Branch is tested and potentially changes backed out (and rest retested), it can be used for the release into production. Only, once it is released, this release can and should get merged back into trunk. Trunk is what is in production. Everything else is in a branch... At least that's the theory... In practice, shortcuts happen. And sh...t happens...
Continue reading...
Continue reading...