Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c7a80a8

Browse files
authoredMar 8, 2023
Update lesson_5.md
Typo fix
1 parent 7c8fe57 commit c7a80a8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎getting_started/javascript-client/lesson_5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ We have a new entry for the log.
187187

188188
## Rebase, what is it about?
189189

190-
After the `contractors` branch is created and data interted into it. The company managers approve the change. We would now like to incorporate the changes back to the main branch. Those who are familiar with the Git workflow will know that we need to perform a merge from the `contractors` branch to the `main` branch. But we are going to do it differently, using rebase instead of merge.
190+
After the `contractors` branch is created and data inserted into it. The company managers approve the change. We would now like to incorporate the changes back to the main branch. Those who are familiar with the Git workflow will know that we need to perform a merge from the `contractors` branch to the `main` branch. But we are going to do it differently, using rebase instead of merge.
191191

192192
Rebase means that we take the changes since branching the database and will continue from another branch. For example, if we rebase `main` from `contractors` we will continue from what `contractors` is now, i.e. after adding the contractors. This means we have incorporated the change in `contractors` into `main`. For more information about rebase have a read of the [Git documentation](https://git-scm.com/docs/git-rebase).
193193

0 commit comments

Comments
 (0)
Please sign in to comment.