Skip to content

Commit 59bf76f

Browse files
typo
1 parent 162b78e commit 59bf76f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/version_control/version_control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ Here we present a list of the terminology we may use when referring to version c
7676
- **Pulling:** retrieving new commits from the remote repository.
7777
- **Conflict:** when changes made by multiple users to the same file are incompatible, you can get into a conflict. _Helping users resolve those conflicts is one of the key advantages of VCS._
7878
- **Branch:** development (time) line. The main development line is often called `main`.
79-
-. **Merge:** combining the commits of two branches, for example, changes on a development branch are merged into the `main` branch.
79+
- **Merge:** combining the commits of two branches, for example, changes on a development branch are merged into the `main` branch.

0 commit comments

Comments
 (0)