File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -624,12 +624,10 @@ which is often the source branch for website projects hosted on GitHub
624
624
625
625
::::::::::::::::::::::::::::::::::::::::::::::::::
626
626
627
- ::::::::::::::::::::::::::::::::::::: testimonial
627
+ ::::::::::::::::::::::::::::::::::::::::: callout
628
628
629
629
## Keeping Main Branch Stable
630
630
631
- ::::::::::::::::::::::::::::::::::::::::::::::::::
632
-
633
631
Good software development practice is to keep the ` main ` branch stable
634
632
while you and the team develop and test new functionalities on feature branches
635
633
(which can be done in parallel and independently by different team members).
@@ -639,7 +637,7 @@ work well with the rest of the code (and not just in isolation).
639
637
We talk more about different types of code testing in one of the following episodes.
640
638
641
639
642
-
640
+ ::::::::::::::::::::::::::::::::::::::::::::::::::
643
641
644
642
:::::::::::::::::::::::::::::::::::::::: keypoints
645
643
Original file line number Diff line number Diff line change 11
11
"episodes/11-software-project.md" "f5e403d2b25781407eaed7534dfff9ec" "site/built/11-software-project.md" "2024-12-06"
12
12
"episodes/12-virtual-environments.md" "bc4f97c27cf5f63646f4be54f6c492d8" "site/built/12-virtual-environments.md" "2025-04-01"
13
13
"episodes/13-ides.md" "5a1badf094a9022c001bdbdbf7ceedfa" "site/built/13-ides.md" "2025-03-07"
14
- "episodes/14-collaboration-using-git.md" "765379f4c22b5a5bd7449f400d8cc140 " "site/built/14-collaboration-using-git.md" "2025-04-01 "
14
+ "episodes/14-collaboration-using-git.md" "8c21ee633bb44148b868504302e129ab " "site/built/14-collaboration-using-git.md" "2025-05-29 "
15
15
"episodes/15-coding-conventions.md" "edeb54ce0ada9fb1a6ae4b38ea391a63" "site/built/15-coding-conventions.md" "2025-04-01"
16
16
"episodes/16-verifying-code-style-linters.md" "0cb677e60bb505b78e523617f49f33de" "site/built/16-verifying-code-style-linters.md" "2025-03-07"
17
17
"episodes/17-section1-optional-exercises.md" "e41c7fe74d6067e4101908deb100162b" "site/built/17-section1-optional-exercises.md" "2025-04-01"
You can’t perform that action at this time.
0 commit comments