diff --git a/content/merging.md b/content/merging.md index 4aa43a07..66bbbe2a 100644 --- a/content/merging.md +++ b/content/merging.md @@ -1,7 +1,7 @@ # Merging changes and contributing to the project Git allows us to have different development lines where we can try things out. -It also allows different people to work on the same project at the same. This +It also allows different people to work on the same project at the same time. This means that we have to somehow combine the changes later. In this part we will practice this: {term}`merging`.