Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/merging.md
Original file line number Diff line number Diff line change
@@ -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`.

Expand Down
Loading