From bf18e03d42e60e27b0ef30dae48faddb43baf088 Mon Sep 17 00:00:00 2001
From: James Robinson <james.em.robinson@gmail.com>
Date: Mon, 8 Nov 2021 15:14:09 +0000
Subject: [PATCH] :bug: Reset git merge

---
 .github/workflows/build_docs.yaml             |  4 +-
 .../04_07_branches.ipynb                      |  6 +-
 .../04_08_git_stash.ipynb                     | 57 +++++++++++++------
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml
index 7bf379f0..7f3b420e 100644
--- a/.github/workflows/build_docs.yaml
+++ b/.github/workflows/build_docs.yaml
@@ -28,7 +28,9 @@ jobs:
           pip install -r requirements.txt
       - name: Build latest documentation
         shell: bash
-        run: ./build_docs.sh
+        run: |
+          git config --global pull.rebase false
+          ./build_docs.sh
       - name: Deploy documentation to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@5dc1d5a192aeb5ab5b7d5a77b7d36aea4a7f5c92 # This is version 4.1.4
         with:
diff --git a/module04_version_control_with_git/04_07_branches.ipynb b/module04_version_control_with_git/04_07_branches.ipynb
index a521f224..bb043429 100644
--- a/module04_version_control_with_git/04_07_branches.ipynb
+++ b/module04_version_control_with_git/04_07_branches.ipynb
@@ -764,11 +764,11 @@
    "source": [
     "## A good branch strategy\n",
     "\n",
-    "* A `production` branch: code used for active work\n",
-    "* A `develop` branch: for general new code\n",
+    "* A `production` or `main` branch: the current working version of your code\n",
+    "* A `develop` branch: where new code can be tested\n",
     "* `feature` branches: for specific new ideas\n",
     "* `release` branches: when you share code with others\n",
-    "  * Useful for isolated bug fixes"
+    "  * Useful for applying bug fixes to older versions of your code"
    ]
   },
   {
diff --git a/module04_version_control_with_git/04_08_git_stash.ipynb b/module04_version_control_with_git/04_08_git_stash.ipynb
index 1d771e6c..05767d6d 100644
--- a/module04_version_control_with_git/04_08_git_stash.ipynb
+++ b/module04_version_control_with_git/04_08_git_stash.ipynb
@@ -31,10 +31,35 @@
     "os.chdir(working_dir)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Remind ourselves which branch we are using:"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 2,
    "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "* main 7444bd0 [local_bare/main] Add Whernside\n"
+     ]
+    }
+   ],
+   "source": [
+    "%%bash\n",
+    "git branch -vv"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -60,7 +85,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -78,7 +103,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -103,7 +128,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -222,7 +247,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -247,7 +272,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -282,7 +307,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -325,7 +350,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -343,7 +368,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
@@ -376,7 +401,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -422,7 +447,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -443,7 +468,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -581,7 +606,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
@@ -606,7 +631,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -636,7 +661,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -645,7 +670,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 18,
    "metadata": {
     "attributes": {
      "classes": [
@@ -705,7 +730,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {