markdown source builds

Auto-generated via `{sandpaper}` Source : f3af3ed Branch : main Author : Dimitrios Theodorakis <[email protected]> Time : 2025-01-10 10:46:28 +0000 Message : MetOffice#43 Adds in a section in 7 conflicts on comparing diffs across branches via GitHub
astroDimitrios · Jan 10, 2025 · e4bcf17 · e4bcf17
1 parent 3d28c24
commit e4bcf17
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/06-conflict.md b/06-conflict.md
@@ -168,7 +168,26 @@ The far left shows how long ago the commit was that changed those lines.
 Then the commit message is displayed before the file contents.
 Click on the little page icon after a commit message to see previous
 commits which altered the same lines.
+Try using blame on the `CITATION.cff` file to see who added
+the conflicting change.
 
+### Compare changes
+
+In the git-novice lesson we learnt how to diff between commits
+on the same branch.
+You can also look at diffs between branches even if they are on
+a different fork using GitHub.
+
+To see a difference for a repository add `/compare`
+to the end of the repository url.
+
+1. Navigate to: [`https://github.com/MetOffice/git-training-demo/compare/`](https://github.com/MetOffice/git-training-demo/compare/),
+and click on the **compare across forks** link.
+2. Click on the **head repository** dropdown and find your fork.
+3. Click on the **compare** dropdown and select your feature branch.
+
+A diff should appear comparing your fork's feature branch with
+the upstream repositories `main` branch.
 
 ## Resolving Conflicts
 

diff --git 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" "a3c16b18c944396e7edc87775f30d583" "site/built/06-conflict.md" "2025-01-09"
+"episodes/06-conflict.md" "168a9bc9aca94e053dcca42cfaef2953" "site/built/06-conflict.md" "2025-01-10"
 "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"