From 9ba1a692312d9b18829c90d7f69a80265e67da27 Mon Sep 17 00:00:00 2001 From: Tom van Woudenberg Date: Mon, 25 Mar 2024 10:02:33 +0100 Subject: [PATCH] Add pulling --- book/workflows/collaboration.md | 1 + book/workflows/edit_book.md | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/book/workflows/collaboration.md b/book/workflows/collaboration.md index ff382f2..5a77c45 100644 --- a/book/workflows/collaboration.md +++ b/book/workflows/collaboration.md @@ -7,6 +7,7 @@ Globally, the steps involved are as follows: 2. Open the files of the repository online or clone the repository to work on it locally 3. Create a branch for your changes 4. Edit the book by: + - Pulling remote changes from others - Staging your changes - Commit a collection of changes - If working on a repository locally: pushing your changes diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index b004607..b6bbfda 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -4,6 +4,19 @@ A jupyter book is composed out of many markdown files which contain the educatio Suppose we are writing a new chapter, or are updating an existing chapter for our Jupyter Book. We've created a new branch on which we are going to make the changes, and we've checked out this branch (make sure this is really the case by checking the name of the current branch in the bottom-left corner of your VS Code window!). +## Pulling + +If you're working on your local version of the repository, you've to make sure you're working on the most up-to-date version of your branch, pull changes from the remote repository on GitHub / GitLab into your local folder. + +`````{tab-set} +````{tab-item} Pulling changes using Git in VS Code +... +```` +````{tab-item} Pulling changes using GitHub Desktop +... +```` +````` + ## Staging `````{tab-set}