From 8d18777177ae93efc04af74e81deb9aa5fbbb2ec Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Thu, 3 Apr 2025 14:26:54 +0200 Subject: [PATCH] Update collaboration.md --- book/workflows/collaboration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/workflows/collaboration.md b/book/workflows/collaboration.md index 02cd9f0..11b20e3 100644 --- a/book/workflows/collaboration.md +++ b/book/workflows/collaboration.md @@ -9,7 +9,7 @@ This page is useful for user type 3, 4 and 5. A jupyter book is composed out of many files which contain the educational content produced by you. Through the use of branches it is possible to work on the book at the same time as your team-members. Working on content for the book is mainly individual work, the beauty of Git comes in when everybody's changes are merged into the main branch. -We have previously introduced the notions of using Git in the online environment (remote) or locally. All the (text, figures, etc.) files that make up the book are contained on the remote repository on GitLab or GitHub. This could be on an open repository on `gitlab.com` or `github.com`. In the context of creating educational books for students at TU Delft, the repository will most likely be located on `gitlab.tudelft.nl` or `github.com/teachbooks`. If this is the first time you interact with books, you're advise to use `github.com`. +We have previously introduced the notions of using Git in the online environment (remote) or locally. All the (text, figures, etc.) files that make up the book are contained on the remote repository on GitLab or GitHub. This could be on an open repository on `gitlab.com` or `github.com`. In the context of creating educational books for students at TU Delft, the repository will most likely be located on `github.com` or `gitlab.tudelft.nl`. If this is the first time you interact with books, you're advise to use `github.com`. The steps involved are as follows: @@ -132,4 +132,4 @@ The steps involved are as follows: ``````` 4. **Check changes online** 5. **Repeat steps 3 and 4 until you're satisfied** - 6. **Reviewing (merge request), (eventually repeat steps 3 and 4) and combine (merging) your version with main draft version of book** \ No newline at end of file + 6. **Reviewing (merge request), (eventually repeat steps 3 and 4) and combine (merging) your version with main draft version of book**