Skip to content

Commit 1d49191

Browse files
authored
Update part11a.md
Style Guide in this context would increase merge compatible and avoid merge conflicts. Sometimes thinks like difference with a line ending would be huge a problem in real software development, even it is invisible problem while writing a code.
1 parent fc23240 commit 1d49191

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/content/11/en/part11a.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The strict definition of CI (Continuous Integration) and the way the term is use
7474
Strictly speaking, CI refers to <a href='https://www.atlassian.com/continuous-delivery/principles/continuous-integration-vs-delivery-vs-deployment'>merging developer changes to the main branch</a> often, Wikipedia even helpfully suggests: "several times a day". This is usually true but when we refer to CI in industry, we're quite often talking about what happens after the actual merge happens.
7575

7676
We'd likely want to do some of these steps:
77-
- Lint: to keep our code clean and maintainable
77+
- Lint: to keep our code clean, maintainable, and merge compatible
7878
- Build: put all of our code together into runnable software bundle
7979
- Test: to ensure we don't break existing features
8080
- Package: Put it all together in an easily movable batch

0 commit comments

Comments
 (0)