Changes for page Continuous Integration

Last modified by chrisby on 2024/05/05 17:22

From version 1.9

edited by chrisby
on 2023/11/28 21:32

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

Page properties

Content

@@ -1,8 +1,8 @@
--Code changes are integrated into the main branch several times a day.
++**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.
  ### Benefit
--**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.
++**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.
  ### Guidelines