From 60035846cca65e662e4677718bf150c5ef85fb85 Mon Sep 17 00:00:00 2001
From: Alok Menghrajani <441307+alokmenghrajani@users.noreply.github.com>
Date: Mon, 7 Apr 2025 21:28:02 +0200
Subject: [PATCH] Update s1-c06-branching-and-merging.md

Add a note about `main` vs `master`. More context here: https://sfconservancy.org/news/2020/jun/23/gitbranchname/

Signed-off-by: Alok Menghrajani <441307+alokmenghrajani@users.noreply.github.com>
---
 text/s1-c06-branching-and-merging.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/text/s1-c06-branching-and-merging.md b/text/s1-c06-branching-and-merging.md
index 8e0b2ad..1517292 100644
--- a/text/s1-c06-branching-and-merging.md
+++ b/text/s1-c06-branching-and-merging.md
@@ -54,6 +54,8 @@ We create a new branch called `experiment` off of our main branch,
 which is by convention called `master`.
 We then switch to the new branch and create a few commits.
 
+Note: it is common nowadays to use `main` as the initial branch name instead of `master`.
+
 ![](../artwork/diagrams/branch-story1.svg)
 
 Then,