Skip to content

Commit 75b60ac

Browse files
A bit more etensive
1 parent 3173136 commit 75b60ac

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
@@ -74,7 +74,7 @@ Here we present a list of the terminology we may use when referring to version c
7474
- **Cloning:** copying (downloading) an existing project on your laptop including the full history and link with the remote repository. Usually, it is done only during the first time of getting the remote repository.
7575
- **Pushing:** uploading new commits (changes) to the remote repository.
7676
- **Fetching:** checking for new changes on the remote repository with respect to your cloned repository.
77-
- **Pulling:** retrieving new commits from the remote repository.
77+
- **Pulling:** retrieving new commits from the remote repository. To prevent issues, always fetch and pull from the remote repository before starting a work session on your computer.
7878
- **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.
7979
- **Branch:** development (time) line. The main development line is often called `main`.
8080
- **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)