From 3d28c243ebdf1fcb9002a01ead62e06c9e8b4a8a Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 9 Jan 2025 17:49:06 +0000
Subject: [PATCH] markdown source builds

Auto-generated via `{sandpaper}`
Source  : 6bbf0053d2596d0c7f2046695e482c249bd3671f
Branch  : main
Author  : Dimitrios Theodorakis <astrodimitrios@gmail.com>
Time    : 2025-01-09 17:48:04 +0000
Message : #42 Fix instructions for resolving the conflict
---
 06-conflict.md | 15 +++++++++++++--
 md5sum.txt     |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/06-conflict.md b/06-conflict.md
index 42e437a..f4a74c2 100644
--- a/06-conflict.md
+++ b/06-conflict.md
@@ -173,7 +173,7 @@ commits which altered the same lines.
 ## Resolving Conflicts
 
 We're going to resolve the conflict by merging
-in our `main` branch into our feature branch
+in the `main` branch into our feature branch
 `7_add-citation-fitzroy`:
 
 ```mermaid
@@ -189,7 +189,18 @@ gitGraph
     merge main
 ```
 
-Switch to the feature branch:
+First we need to make sure our fork's `main` branch
+is in sync with the upstream repository.
+Navigate to your fork on GitHub and click on the **Sync fork** button.
+
+In your local copy of your fork, update the `main` branch:
+
+```bash
+$ git switch main
+$ git pull
+```
+
+Switch back to the feature branch:
 
 ```bash
 $ git switch 7_add-citation-fitzroy
diff --git a/md5sum.txt b/md5sum.txt
index 49e09a9..8e58e25 100644
--- a/md5sum.txt
+++ b/md5sum.txt
@@ -10,7 +10,7 @@
 "episodes/04-review.md" "90bf3c25ead2368b8664603c6667a457" "site/built/04-review.md" "2025-01-09"
 "episodes/Break.md" "96f3c03ec9cd646c6366f840b7f21107" "site/built/Break.md" "2025-01-09"
 "episodes/05-forks.md" "47b583e34640bfbf92abb84c2c97540c" "site/built/05-forks.md" "2025-01-09"
-"episodes/06-conflict.md" "a8d0c3432d9ba941acb7607a264f117a" "site/built/06-conflict.md" "2024-12-03"
+"episodes/06-conflict.md" "a3c16b18c944396e7edc87775f30d583" "site/built/06-conflict.md" "2025-01-09"
 "episodes/07-history.md" "06de9dc87212934f2d7fc6ea7bbd97b2" "site/built/07-history.md" "2025-01-09"
 "episodes/End.md" "42f2019c55b38db5ec0eab909b6bca4d" "site/built/End.md" "2025-01-09"
 "episodes/08-rebase.md" "7e00861bac4464ebf12cfac75109cdd6" "site/built/08-rebase.md" "2025-01-09"