You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/version_control/version_control.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -76,4 +76,4 @@ Here we present a list of the terminology we may use when referring to version c
76
76
-**Pulling:** retrieving new commits from the remote repository.
77
77
-**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._
78
78
-**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