From e157e120fbf69e7d6108f0539e996b2f6c09ba14 Mon Sep 17 00:00:00 2001 From: Sanket Gadgil Date: Thu, 29 May 2025 13:56:28 +0100 Subject: [PATCH] Fixed the formatting for the "Keeping Main Branch Stable" in "14-collaboration-using-git.md" and changed the tag from "testimonial" to "callout". --- episodes/14-collaboration-using-git.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/episodes/14-collaboration-using-git.md b/episodes/14-collaboration-using-git.md index fe5c92f92..024e0b66a 100644 --- a/episodes/14-collaboration-using-git.md +++ b/episodes/14-collaboration-using-git.md @@ -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). @@ -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