Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions episodes/14-collaboration-using-git.md
Original file line number Diff line number Diff line change
Expand Up @@ -624,12 +624,10 @@ which is often the source branch for website projects hosted on GitHub

::::::::::::::::::::::::::::::::::::::::::::::::::

::::::::::::::::::::::::::::::::::::: testimonial
::::::::::::::::::::::::::::::::::::::::: callout

## Keeping Main Branch Stable

::::::::::::::::::::::::::::::::::::::::::::::::::

Good software development practice is to keep the `main` branch stable
while you and the team develop and test new functionalities on feature branches
(which can be done in parallel and independently by different team members).
Expand All @@ -639,7 +637,7 @@ work well with the rest of the code (and not just in isolation).
We talk more about different types of code testing in one of the following episodes.



::::::::::::::::::::::::::::::::::::::::::::::::::

:::::::::::::::::::::::::::::::::::::::: keypoints

Expand Down