Skip to Content

Changes for page Continuous Integration

Last modified by chrisby on 2024/05/05 17:22
From version 1.8
edited by chrisby
on 2023/11/28 21:27
Change comment: There is no comment for this version
To version 1.10
edited by chrisby
on 2024/01/13 18:02
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,8 +1,8 @@
1 -Code changes are integrated into the main branch several times a day.
1 +**Integrate code change at least once a day.** This means that code changes on a feature branch you are working on should be merged/integrated into the main branch, and main branch changes should be merged into the feature branch.
2 2  
3 3  ### Benefit
4 4  
5 -**Early Integration Is Cheaper**: The longer side branches wait to be merged into the main branch, the greater the risk of multiple integration conflicts. It is easier to fix small individual integration problems iteratively than to fix multiple problems at once. Therefore, continuous integration has the advantage of identifying integration problems early, when they are cheap to fix.
5 +**Many Small Integrations Are Cheaper**: The longer side branches wait to be merged into the main branch, and the larger the differences between them become, the greater the risk of multiple integration conflicts. It is easier to fix small individual integration problems iteratively than it is to fix multiple problems at once. Therefore, continuous integration has the advantage of catching integration problems early, when they are cheap to fix.
6 6  
7 7  ### Guidelines
8 8  
... ... @@ -15,5 +15,4 @@
15 15  Requesting and providing code reviews, as on GitHub or GitLab, is a convenient feature for making code reviews asynchronous and remotely available, but it is not the most time-efficient approach for agile teams that do not need these features. For these teams, it is better to maintain high quality code by following these agile practices:
16 16  
17 17  * Code is properly tested, refactored and simplified.
18 -* Code is implicitly reviewed by a second team member through pair programming.
19 -* Code review is done in real time by pairing with a technically experienced member just before integration into the main branch.
18 +* Code is implicitly reviewed in real time by pairing it with technically experienced team members.