Skip to content

Commit 3241201

Browse files
authored
Update part11a.md
'main' repeated two times, replaced second instance with 'master'
1 parent 25e7f16 commit 3241201

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
@@ -33,7 +33,7 @@ In this part we'll be using some terms you may not be familiar with or you may n
3333

3434
#### Branches
3535

36-
Git allows multiple copies, streams, or versions of the code to co-exist without overwriting each other. When you first create a repository, you will be looking at the main branch (usually in Git, we call this <i>main</i> or <i>main</i>, but that does vary in older projects). This is fine if there's only one developer for a project and that developer only works on one feature at a time.
36+
Git allows multiple copies, streams, or versions of the code to co-exist without overwriting each other. When you first create a repository, you will be looking at the main branch (usually in Git, we call this <i>main</i> or <i>master</i>, but that does vary in older projects). This is fine if there's only one developer for a project and that developer only works on one feature at a time.
3737

3838
Branches are useful when this environment becomes more complex. In this context, each developer can have one or more branches. Each branch is effectively a copy of the main branch with some changes that make it diverge from it. Once the feature or change in the branch is ready it can be <i>merged</i> back into the main branch, effectively making that feature or change part of the main software. In this way, each developer can work on their own set of changes and not affect any other developer until the changes are ready.
3939

0 commit comments

Comments
 (0)